as-test 1.0.15 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "as-test",
-  "version": "1.0.15",
+  "version": "1.1.0",
   "author": "Jairus Tanaka",
   "repository": {
     "type": "git",
@@ -32,6 +32,12 @@
     "as-test": "./bin/index.js",
     "ast": "./bin/index.js"
   },
+  "exports": {
+    ".": "./index.ts",
+    "./lib": "./lib/build/index.js",
+    "./transform": "./transform/lib/index.js",
+    "./package.json": "./package.json"
+  },
   "bugs": {
     "url": "https://github.com/JairusSW/as-test/issues"
   },
@@ -43,6 +49,8 @@
     "!assembly/__tests__/**",
     "!assembly/tsconfig.json",
     "bin/**/*.js",
+    "lib/**/*.js",
+    "lib/**/*.d.ts",
     "templates/**/*.js",
     "transform/lib/**/*.js",
     "transform/package.json",
@@ -66,6 +74,7 @@
   },
   "scripts": {
     "test": "node ./bin/index.js test --parallel",
+    "test:integration": "npm run build:cli && npm run build:lib && node --test tests/*.test.mjs",
     "test:ci": "node ./bin/index.js test --parallel --tap --config ./as-test.ci.config.json",
     "fuzz": "node ./bin/index.js fuzz",
     "bench:seed": "node ./bin/index.js fuzz --config ./as-test.bench.config.json --clean",
@@ -75,8 +84,9 @@
     "ci:act:pr": "bash ./tools/act.sh pull_request",
     "ci:act:tests": "act push -W .github/workflows/as-test.yml",
     "ci:act:examples": "act push -W .github/workflows/examples.yml",
-    "typecheck": "tsc -p cli --noEmit && tsc -p transform --noEmit",
+    "typecheck": "tsc -p cli --noEmit && tsc -p tsconfig.lib.json --noEmit && tsc -p transform --noEmit",
     "lint": "eslint transform/src/**/*.ts tools/**/*.js eslint.config.js",
+    "build:lib": "tsc -p ./tsconfig.lib.json",
     "build:transform": "tsc -p ./transform",
     "build:cli": "tsc -p cli",
     "build:run": "npm run build:cli",
@@ -84,8 +94,8 @@
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs",
     "format": "prettier -w .",
-    "release:check": "npm run build:cli && npm run build:transform && npm run test && npm run test:examples && npm pack --dry-run --cache /tmp/as-test-npm-cache",
-    "prepublishOnly": "npm run build:cli && npm run build:transform && npm run test"
+    "release:check": "npm run build:cli && npm run build:lib && npm run build:transform && npm run test && npm run test:integration && npm run test:examples && npm pack --dry-run --cache /tmp/as-test-npm-cache",
+    "prepublishOnly": "npm run build:cli && npm run build:lib && npm run build:transform && npm run test && npm run test:integration"
   },
   "type": "module"
 }

package/transform/lib/mock.js

@@ -1,15 +1,14 @@
-import { Node, FunctionDeclaration, } from "assemblyscript/dist/assemblyscript.js";
+import { Node, IdentifierExpression, } from "assemblyscript/dist/assemblyscript.js";
 import { Visitor } from "./visitor.js";
 import { toString } from "./util.js";
 export class MockTransform extends Visitor {
     srcCurrent = null;
     globalStatements = [];
     mocked = new Set();
-    importFns = [];
     importMocked = new Set();
     visitCallExpression(node) {
         super.visitCallExpression(node);
-        const name = normalizeName(toString(node.expression));
+        const name = normalizeName(expressionName(node.expression));
         if (this.mocked.has(name + "_mock")) {
             node.expression = Node.createIdentifierExpression(name + "_mock", node.expression.range);
             return;
@@ -25,7 +24,7 @@ export class MockTransform extends Visitor {
             const oldFn = node.args[0];
             if (!oldFn)
                 return;
-            this.mocked.delete(normalizeName(toString(oldFn)) + "_mock");
+            this.mocked.delete(normalizeName(expressionName(oldFn)) + "_mock");
             return;
         }
         if (name == "unmockImport") {
@@ -33,10 +32,12 @@ export class MockTransform extends Visitor {
         }
         if (name != "mockFn")
             return;
-        const ov = toString(node.args[0]);
-        const cb = node.args[1];
-        const newName = normalizeName(ov);
-        const newFn = Node.createFunctionDeclaration(Node.createIdentifierExpression(newName + "_mock", cb.range), cb.declaration.decorators, 0, cb.declaration.typeParameters, cb.declaration.signature, cb.declaration.body, cb.declaration.arrowKind, cb.range);
+        const oldValue = node.args[0];
+        const callback = node.args[1];
+        if (!oldValue || !callback)
+            return;
+        const newName = normalizeName(expressionName(oldValue));
+        const newFn = Node.createFunctionDeclaration(Node.createIdentifierExpression(newName + "_mock", callback.range), callback.declaration.decorators, 0, callback.declaration.typeParameters, callback.declaration.signature, callback.declaration.body, callback.declaration.arrowKind, callback.range);
         const currentSource = this.srcCurrent;
         if (!currentSource)
             return;
@@ -55,20 +56,23 @@ export class MockTransform extends Visitor {
         this.mocked.add(newFn.name.text);
     }
     visitFunctionDeclaration(node, isDefault) {
-        if (!node.body)
-            this.importFns.push(node);
+        if (this.mocked.has(node.name.text))
+            return;
         super.visitFunctionDeclaration(node, isDefault);
     }
     visitSource(node) {
         this.mocked = new Set();
         this.srcCurrent = node;
-        this.importFns = [];
         super.visitSource(node);
-        for (const node of this.importFns) {
-            let path;
-            const currentSource = this.srcCurrent;
-            if (!currentSource)
+        const currentSource = this.srcCurrent;
+        if (!currentSource)
+            return;
+        const stmts = currentSource.statements;
+        for (let index = 0; index < stmts.length; index++) {
+            const node = stmts[index];
+            if (!isBodylessTopLevelFunction(node))
                 continue;
+            let path;
             const dec = node.decorators?.find((v) => v.name.text == "external");
             const decArgs = dec?.args ?? [];
             if (!dec) {
@@ -85,24 +89,13 @@ export class MockTransform extends Visitor {
                         decArgs[0].value;
             else
                 path = currentSource.simplePath + "." + node.name.text;
-            const stmts = currentSource.statements;
-            let index = -1;
-            for (let i = 0; i < stmts.length; i++) {
-                const stmt = stmts[i];
-                if (stmt instanceof FunctionDeclaration &&
-                    stmt.name.text === node.name.text) {
-                    index = i;
-                    break;
-                }
-            }
-            if (index === -1)
-                continue;
             const registerImportTarget = Node.createExpressionStatement(Node.createCallExpression(Node.createPropertyAccessExpression(Node.createIdentifierExpression("__mock_import_target_by_index", node.range), Node.createIdentifierExpression("set", node.range), node.range), null, [
                 Node.createPropertyAccessExpression(Node.createIdentifierExpression(node.name.text, node.range), Node.createIdentifierExpression("index", node.range), node.range),
                 Node.createStringLiteralExpression(path, node.range),
             ], node.range));
             if (!this.importMocked.has(path)) {
                 stmts.splice(index + 1, 0, registerImportTarget);
+                index++;
                 continue;
             }
             const args = [
@@ -115,9 +108,18 @@ export class MockTransform extends Visitor {
                 Node.createReturnStatement(Node.createCallExpression(Node.createIdentifierExpression("call_indirect", node.range), null, args, node.range), node.range),
             ], node.range), 0, node.range);
             stmts.splice(index, 1, newFn, registerImportTarget);
+            index++;
         }
     }
 }
+function isBodylessTopLevelFunction(node) {
+    const candidate = node;
+    return (candidate != null &&
+        typeof candidate == "object" &&
+        candidate.name instanceof IdentifierExpression &&
+        "signature" in candidate &&
+        candidate.body == null);
+}
 function normalizeName(value) {
     return value
         .replaceAll(".", "_")
@@ -125,3 +127,24 @@ function normalizeName(value) {
         .replaceAll("]", "_")
         .replace(/[^A-Za-z0-9_]/g, "_");
 }
+function expressionName(node) {
+    const candidate = node;
+    if (!candidate || typeof candidate != "object")
+        return "";
+    if (typeof candidate.text == "string")
+        return candidate.text;
+    const propertyText = candidate.property?.text;
+    if (propertyText && candidate.expression) {
+        const left = expressionName(candidate.expression);
+        return left.length ? `${left}.${propertyText}` : propertyText;
+    }
+    const sourceText = candidate.range?.source?.text;
+    if (typeof sourceText == "string") {
+        const raw = sourceText
+            .slice(candidate.range.start, candidate.range.end)
+            .trim();
+        if (raw.length)
+            return raw;
+    }
+    return toString(candidate);
+}