@jay-framework/dev-server 0.16.5 → 0.17.0

package/dist/index.js

@@ -569,7 +569,7 @@ class SourceFileBindingResolver {
     return new GlobalResolvedType(globalVariableRoot.name);
   }
 }
-const { isStringLiteral: isStringLiteral$1 } = c;
+const { isStringLiteral: isStringLiteral$2 } = c;
 function areFlattenedAccessChainsEqual(chain1, chain2) {
   if (chain1.path.length !== chain2.path.length) {
     return false;
@@ -593,8 +593,8 @@ function areVariableRootsEqual(root1, root2) {
   switch (root1.kind) {
     case VariableRootType.ImportModule:
       if (isImportModuleVariableRoot(root1) && isImportModuleVariableRoot(root2)) {
-        const module1 = isStringLiteral$1(root1.module) ? root1.module.text : String(root1.module);
-        const module2 = isStringLiteral$1(root2.module) ? root2.module.text : String(root2.module);
+        const module1 = isStringLiteral$2(root1.module) ? root1.module.text : String(root1.module);
+        const module2 = isStringLiteral$2(root2.module) ? root2.module.text : String(root2.module);
         return module1 === module2 && root1.importType === root2.importType;
       }
       return false;
@@ -630,7 +630,7 @@ function shouldRemoveMethod(methodName, environment) {
     return true;
   return false;
 }
-const { isCallExpression: isCallExpression$1, isPropertyAccessExpression: isPropertyAccessExpression$1, isIdentifier: isIdentifier$2, isStringLiteral } = c$1;
+const { isCallExpression: isCallExpression$1, isPropertyAccessExpression: isPropertyAccessExpression$1, isIdentifier: isIdentifier$2, isStringLiteral: isStringLiteral$1 } = c$1;
 function findBuilderMethodsToRemove(sourceFile, bindingResolver, environment) {
   const callsToRemove = [];
   const removedVariables = /* @__PURE__ */ new Set();
@@ -659,7 +659,7 @@ function isPartOfJayStackChain(callExpr, bindingResolver) {
       if (isIdentifier$2(current.expression)) {
         const variable = bindingResolver.explain(current.expression);
         const flattened = flattenVariable(variable);
-        if (flattened.path.length === 1 && JAY_BUILDER_FUNCTIONS.has(flattened.path[0]) && isImportModuleVariableRoot(flattened.root) && isStringLiteral(flattened.root.module) && flattened.root.module.text === "@jay-framework/fullstack-component")
+        if (flattened.path.length === 1 && JAY_BUILDER_FUNCTIONS.has(flattened.path[0]) && isImportModuleVariableRoot(flattened.root) && isStringLiteral$1(flattened.root.module) && flattened.root.module.text === "@jay-framework/fullstack-component")
           return true;
       }
       if (isPropertyAccessExpression$1(current.expression)) {
@@ -790,11 +790,14 @@ const {
   isPropertyAccessExpression,
   isImportDeclaration,
   isNamedImports,
-  isIdentifier
+  isIdentifier,
+  isStringLiteral
 } = c$1;
-function transformJayStackBuilder(code, filePath, environment) {
+function transformJayStackBuilder(code, filePath, environment, stripBuilders) {
   const sourceFile = createSourceFile(filePath, code, ScriptTarget.Latest, true);
-  const transformers = [mkTransformer(mkJayStackCodeSplitTransformer, { environment })];
+  const transformers = [
+    mkTransformer(mkJayStackCodeSplitTransformer, { environment, stripBuilders })
+  ];
   const printer = createPrinter();
   const result = c$1.transform(sourceFile, transformers);
   const transformedFile = result.transformed[0];
@@ -811,10 +814,25 @@ function mkJayStackCodeSplitTransformer({
   factory,
   sourceFile,
   context,
-  environment
+  environment,
+  stripBuilders
 }) {
   const bindingResolver = new SourceFileBindingResolver(sourceFile);
-  const { callsToRemove } = findBuilderMethodsToRemove(sourceFile, bindingResolver, environment);
+  let workingSourceFile = sourceFile;
+  if (stripBuilders && stripBuilders.size > 0) {
+    const filtered = sourceFile.statements.filter((statement) => {
+      const rootName = findChainRootBuilderName(statement, bindingResolver);
+      return !rootName || !stripBuilders.has(rootName);
+    });
+    if (filtered.length !== sourceFile.statements.length) {
+      workingSourceFile = factory.updateSourceFile(sourceFile, filtered);
+    }
+  }
+  const { callsToRemove } = findBuilderMethodsToRemove(
+    workingSourceFile,
+    bindingResolver,
+    environment
+  );
   const transformVisitor = (node) => {
     if (isCallExpression(node) && isPropertyAccessExpression(node.expression)) {
       const variable = bindingResolver.explain(node.expression);
@@ -827,7 +845,7 @@ function mkJayStackCodeSplitTransformer({
     return visitEachChild(node, transformVisitor, context);
   };
   let transformedSourceFile = visitEachChild(
-    sourceFile,
+    workingSourceFile,
     transformVisitor,
     context
   );
@@ -867,6 +885,36 @@ function filterImportDeclaration(statement, unusedImports, factory) {
     statement.assertClause
   );
 }
+function findChainRootBuilderName(statement, bindingResolver) {
+  let expr;
+  if (c$1.isVariableStatement(statement)) {
+    for (const decl of statement.declarationList.declarations) {
+      if (decl.initializer && isCallExpression(decl.initializer)) {
+        expr = decl.initializer;
+      }
+    }
+  }
+  if (c$1.isExpressionStatement(statement) && isCallExpression(statement.expression)) {
+    expr = statement.expression;
+  }
+  if (!expr)
+    return void 0;
+  let current = expr;
+  while (true) {
+    if (isCallExpression(current) && isPropertyAccessExpression(current.expression)) {
+      current = current.expression.expression;
+    } else if (isCallExpression(current) && isIdentifier(current.expression)) {
+      const variable = bindingResolver.explain(current.expression);
+      const flattened = flattenVariable(variable);
+      if (flattened.path.length === 1 && isImportModuleVariableRoot(flattened.root) && isStringLiteral(flattened.root.module) && flattened.root.module.text === "@jay-framework/fullstack-component") {
+        return flattened.path[0];
+      }
+      return void 0;
+    } else {
+      return void 0;
+    }
+  }
+}
 const actionMetadataCache = /* @__PURE__ */ new Map();
 function clearActionMetadataCache() {
   actionMetadataCache.clear();
@@ -1275,6 +1323,9 @@ function jayStackCompiler(options = {}) {
         if (!id.endsWith(".ts") && !id.includes(".ts?")) {
           return null;
         }
+        if (id.includes(".jay-html")) {
+          return null;
+        }
         const hasComponent = code.includes("makeJayStackComponent");
         const hasInit = code.includes("makeJayInit");
         if (!hasComponent && !hasInit) {
@@ -1384,6 +1435,23 @@ function jayStackCompiler(options = {}) {
           }
           const result = lines.join("\n");
           return result;
+        },
+        // Strip inline makeJayAction/makeJayQuery/makeJayStream statements
+        // from component files in client builds. These are server-only
+        // constructs that shouldn't appear in client bundles.
+        transform(code, id, options2) {
+          if (options2?.ssr || isSSRBuild)
+            return null;
+          if (!id.endsWith(".ts") && !id.includes(".ts?"))
+            return null;
+          if (id.includes(".jay-html"))
+            return null;
+          if (isActionImport(id))
+            return null;
+          const ACTION_BUILDERS = ["makeJayAction", "makeJayQuery", "makeJayStream"];
+          if (!ACTION_BUILDERS.some((b) => code.includes(b)))
+            return null;
+          return stripInlineActionBuilders(code, ACTION_BUILDERS);
         }
       };
     })(),
@@ -1392,6 +1460,9 @@ function jayStackCompiler(options = {}) {
   );
   return plugins;
 }
+function stripInlineActionBuilders(code, builderNames) {
+  return transformJayStackBuilder(code, "action-strip.ts", "client", new Set(builderNames));
+}
 async function createViteServer(options) {
   const {
     projectRoot,
@@ -2294,7 +2365,7 @@ function defaults(options) {
     projectRootFolder,
     options.pagesRootFolder || "./src/pages"
   );
-  const buildFolder = options.buildFolder || path__default.resolve(projectRootFolder, "./build");
+  const buildFolder = options.buildFolder || path__default.resolve(projectRootFolder, "./build/dev");
   const tsConfigFilePath = options.jayRollupConfig.tsConfigFilePath || path__default.resolve(projectRootFolder, "./tsconfig.json");
   return {
     publicBaseUrlPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.16.5",
+  "version": "0.17.0",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -23,23 +23,23 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.16.5",
-    "@jay-framework/compiler-shared": "^0.16.5",
-    "@jay-framework/component": "^0.16.5",
-    "@jay-framework/fullstack-component": "^0.16.5",
-    "@jay-framework/logger": "^0.16.5",
-    "@jay-framework/runtime": "^0.16.5",
-    "@jay-framework/stack-client-runtime": "^0.16.5",
-    "@jay-framework/stack-route-scanner": "^0.16.5",
-    "@jay-framework/stack-server-runtime": "^0.16.5",
-    "@jay-framework/view-state-merge": "^0.16.5",
+    "@jay-framework/compiler-jay-stack": "^0.17.0",
+    "@jay-framework/compiler-shared": "^0.17.0",
+    "@jay-framework/component": "^0.17.0",
+    "@jay-framework/fullstack-component": "^0.17.0",
+    "@jay-framework/logger": "^0.17.0",
+    "@jay-framework/runtime": "^0.17.0",
+    "@jay-framework/stack-client-runtime": "^0.17.0",
+    "@jay-framework/stack-route-scanner": "^0.17.0",
+    "@jay-framework/stack-server-runtime": "^0.17.0",
+    "@jay-framework/view-state-merge": "^0.17.0",
     "busboy": "^1.6.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.16.5",
-    "@jay-framework/jay-cli": "^0.16.5",
-    "@jay-framework/stack-client-runtime": "^0.16.5",
+    "@jay-framework/dev-environment": "^0.17.0",
+    "@jay-framework/jay-cli": "^0.17.0",
+    "@jay-framework/stack-client-runtime": "^0.17.0",
     "@playwright/test": "^1.58.2",
     "@types/busboy": "^1.5.4",
     "@types/express": "^5.0.2",