Fix .d.ts resolve in TS tests

packages/prepack/src/Prepack.res

@@ -186,19 +186,35 @@ let filesMapping = [
   ("setGlobalConfig", "S.setGlobalConfig"),
 ]
 
-NodeJs.Fs.writeFileSyncWith(
-  "./src/S.mjs",
-  ["import * as S from \"./S_Core.res.mjs\";"]
-  ->Array.concat(filesMapping->Array.map(((name, value)) => `export const ${name} = ${value}`))
-  ->Array.join("\n")
-  ->NodeJs.Buffer.fromString,
-  {
-    encoding: "utf8",
-  },
-)
+sourePaths->Array.forEach(path => {
+  FsX.cpSync(
+    ~src=NodeJs.Path.join2(projectPath, path),
+    ~dest=NodeJs.Path.join2(artifactsPath, path),
+    {recursive: true},
+  )
+})
 
+let writeSjsEsm = path => {
+  NodeJs.Fs.writeFileSyncWith(
+    path,
+    ["import * as S from \"./S_Core.res.mjs\";"]
+    ->Array.concat(filesMapping->Array.map(((name, value)) => `export const ${name} = ${value}`))
+    ->Array.join("\n")
+    ->NodeJs.Buffer.fromString,
+    {
+      encoding: "utf8",
+    },
+  )
+}
+
+// Sync the original source as well. Call it S.js to make .d.ts resolve correctly
+writeSjsEsm("./src/S.js")
+
+writeSjsEsm(NodeJs.Path.join2(artifactsPath, "./src/S.mjs"))
+
+// This should overwrite S.js with the commonjs version
 NodeJs.Fs.writeFileSyncWith(
-  "./src/S.js",
+  NodeJs.Path.join2(artifactsPath, "./src/S.js"),
   ["var S = require(\"./S_Core.res.js\");"]
   ->Array.concat(filesMapping->Array.map(((name, value)) => `exports.${name} = ${value}`))
   ->Array.join("\n")
@@ -208,14 +224,6 @@ NodeJs.Fs.writeFileSyncWith(
   },
 )
 
-sourePaths->Array.forEach(path => {
-  FsX.cpSync(
-    ~src=NodeJs.Path.join2(projectPath, path),
-    ~dest=NodeJs.Path.join2(artifactsPath, path),
-    {recursive: true},
-  )
-})
-
 let updateJsonFile = (~src, ~path, ~value) => {
   let packageJsonData = NodeJs.Fs.readFileSyncWith(
     src,

packages/prepack/src/Prepack.res.mjs

@@ -328,24 +328,30 @@ var filesMapping = [
   ]
 ];
 
-Nodefs.writeFileSync("./src/S.mjs", Buffer.from(["import * as S from \"./S_Core.res.mjs\";"].concat(filesMapping.map(function (param) {
-                    return "export const " + param[0] + " = " + param[1];
-                  })).join("\n")), {
-      encoding: "utf8"
+sourePaths.forEach(function (path) {
+      Fs.cpSync(Nodepath.join(projectPath, path), Nodepath.join(artifactsPath, path), {
+            recursive: true
+          });
     });
 
-Nodefs.writeFileSync("./src/S.js", Buffer.from(["var S = require(\"./S_Core.res.js\");"].concat(filesMapping.map(function (param) {
+function writeSjsEsm(path) {
+  Nodefs.writeFileSync(path, Buffer.from(["import * as S from \"./S_Core.res.mjs\";"].concat(filesMapping.map(function (param) {
+                      return "export const " + param[0] + " = " + param[1];
+                    })).join("\n")), {
+        encoding: "utf8"
+      });
+}
+
+writeSjsEsm("./src/S.js");
+
+writeSjsEsm(Nodepath.join(artifactsPath, "./src/S.mjs"));
+
+Nodefs.writeFileSync(Nodepath.join(artifactsPath, "./src/S.js"), Buffer.from(["var S = require(\"./S_Core.res.js\");"].concat(filesMapping.map(function (param) {
                     return "exports." + param[0] + " = " + param[1];
                   })).join("\n")), {
       encoding: "utf8"
     });
 
-sourePaths.forEach(function (path) {
-      Fs.cpSync(Nodepath.join(projectPath, path), Nodepath.join(artifactsPath, path), {
-            recursive: true
-          });
-    });
-
 function updateJsonFile(src, path, value) {
   var packageJsonData = Nodefs.readFileSync(src, {
         encoding: "utf8"

packages/tests/src/core/S_test.ts

@@ -1,8 +1,8 @@
 import { StandardSchemaV1 } from "./../../../../src/S.d";
-import test, { ExecutionContext } from "ava";
+import test from "ava";
 import { expectType, TypeEqual } from "ts-expect";
 
-import * as S from "../../../../src/S.mjs";
+import * as S from "../../../../src/S.js";
 import { stringSchema } from "../genType/GenType.gen.js";
 
 type SchemaEqual<

src/S.js

@@ -1,71 +1,71 @@
-'use strict';
-var S = require("./S_Core.res.mjs");
-exports.Error = S.$$Error.$$class
-exports.string = S.string
-exports.boolean = S.bool
-exports.int32 = S.$$int
-exports.number = S.$$float
-exports.bigint = S.bigint
-exports.json = S.json
-exports.never = S.never
-exports.unknown = S.unknown
-exports.undefined = S.unit
-exports.optional = S.js_optional
-exports.nullable = S.$$null
-exports.nullish = S.nullable
-exports.array = S.array
-exports.unnest = S.unnest
-exports.record = S.dict
-exports.jsonString = S.jsonString
-exports.union = S.js_union
-exports.object = S.object
-exports.schema = S.js_schema
-exports.safe = S.js_safe
-exports.safeAsync = S.js_safeAsync
-exports.reverse = S.reverse
-exports.convertOrThrow = S.convertOrThrow
-exports.convertToJsonOrThrow = S.convertToJsonOrThrow
-exports.convertToJsonStringOrThrow = S.convertToJsonStringOrThrow
-exports.reverseConvertOrThrow = S.reverseConvertOrThrow
-exports.reverseConvertToJsonOrThrow = S.reverseConvertToJsonOrThrow
-exports.reverseConvertToJsonStringOrThrow =   S.reverseConvertToJsonStringOrThrow
-exports.parseOrThrow = S.parseOrThrow
-exports.parseJsonOrThrow = S.parseJsonOrThrow
-exports.parseJsonStringOrThrow = S.parseJsonStringOrThrow
-exports.parseAsyncOrThrow = S.parseAsyncOrThrow
-exports.assertOrThrow = S.assertOrThrow
-exports.recursive = S.recursive
-exports.merge = S.js_merge
-exports.strict = S.strict
-exports.deepStrict = S.deepStrict
-exports.strip = S.strip
-exports.deepStrip = S.deepStrip
-exports.custom = S.js_custom
-exports.standard = S.standard
-exports.tuple = S.tuple
-exports.asyncParserRefine = S.js_asyncParserRefine
-exports.refine = S.js_refine
-exports.transform = S.js_transform
-exports.description = S.description
-exports.describe = S.describe
-exports.name = S.js_name
-exports.setName = S.setName
-exports.removeTypeValidation = S.removeTypeValidation
-exports.compile = S.compile
-exports.port = S.port
-exports.numberMin = S.floatMin
-exports.numberMax = S.floatMax
-exports.arrayMinLength = S.arrayMinLength
-exports.arrayMaxLength = S.arrayMaxLength
-exports.arrayLength = S.arrayLength
-exports.stringMinLength = S.stringMinLength
-exports.stringMaxLength = S.stringMaxLength
-exports.stringLength = S.stringLength
-exports.email = S.email
-exports.uuid = S.uuid
-exports.cuid = S.cuid
-exports.url = S.url
-exports.pattern = S.pattern
-exports.datetime = S.datetime
-exports.trim = S.trim
-exports.setGlobalConfig = S.setGlobalConfig
+import * as S from "./S_Core.res.mjs";
+export const Error = S.$$Error.$$class;
+export const string = S.string;
+export const boolean = S.bool;
+export const int32 = S.$$int;
+export const number = S.$$float;
+export const bigint = S.bigint;
+export const json = S.json;
+export const never = S.never;
+export const unknown = S.unknown;
+export const undefined = S.unit;
+export const optional = S.js_optional;
+export const nullable = S.$$null;
+export const nullish = S.nullable;
+export const array = S.array;
+export const unnest = S.unnest;
+export const record = S.dict;
+export const jsonString = S.jsonString;
+export const union = S.js_union;
+export const object = S.object;
+export const schema = S.js_schema;
+export const safe = S.js_safe;
+export const safeAsync = S.js_safeAsync;
+export const reverse = S.reverse;
+export const convertOrThrow = S.convertOrThrow;
+export const convertToJsonOrThrow = S.convertToJsonOrThrow;
+export const convertToJsonStringOrThrow = S.convertToJsonStringOrThrow;
+export const reverseConvertOrThrow = S.reverseConvertOrThrow;
+export const reverseConvertToJsonOrThrow = S.reverseConvertToJsonOrThrow;
+export const reverseConvertToJsonStringOrThrow =
+  S.reverseConvertToJsonStringOrThrow;
+export const parseOrThrow = S.parseOrThrow;
+export const parseJsonOrThrow = S.parseJsonOrThrow;
+export const parseJsonStringOrThrow = S.parseJsonStringOrThrow;
+export const parseAsyncOrThrow = S.parseAsyncOrThrow;
+export const assertOrThrow = S.assertOrThrow;
+export const recursive = S.recursive;
+export const merge = S.js_merge;
+export const strict = S.strict;
+export const deepStrict = S.deepStrict;
+export const strip = S.strip;
+export const deepStrip = S.deepStrip;
+export const custom = S.js_custom;
+export const standard = S.standard;
+export const tuple = S.tuple;
+export const asyncParserRefine = S.js_asyncParserRefine;
+export const refine = S.js_refine;
+export const transform = S.js_transform;
+export const description = S.description;
+export const describe = S.describe;
+export const name = S.js_name;
+export const setName = S.setName;
+export const removeTypeValidation = S.removeTypeValidation;
+export const compile = S.compile;
+export const port = S.port;
+export const numberMin = S.floatMin;
+export const numberMax = S.floatMax;
+export const arrayMinLength = S.arrayMinLength;
+export const arrayMaxLength = S.arrayMaxLength;
+export const arrayLength = S.arrayLength;
+export const stringMinLength = S.stringMinLength;
+export const stringMaxLength = S.stringMaxLength;
+export const stringLength = S.stringLength;
+export const email = S.email;
+export const uuid = S.uuid;
+export const cuid = S.cuid;
+export const url = S.url;
+export const pattern = S.pattern;
+export const datetime = S.datetime;
+export const trim = S.trim;
+export const setGlobalConfig = S.setGlobalConfig;

wallaby.conf.js

@@ -9,7 +9,7 @@ export default () => ({
     "package.json",
     "src/S.res.mjs",
     "src/S_Core.res.mjs",
-    "src/S.mjs",
+    "src/S.js",
     "packages/tests/src/utils/U.res.mjs",
   ],
   tests,