wip

Author: aarondfrancis

.github/workflows/tests-base.yml

@@ -36,11 +36,22 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
           coverage: none
 
-      - name: Install Dependencies
+      - name: Install PHP Dependencies
         run: |
           composer self-update
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
-      - name: Run Tests
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install Node Dependencies
+        run: npm install
+
+      - name: Run npm tests
+        run: npm run test
+
+      - name: Run PHP Tests
         run: vendor/bin/phpunit

packages/vue/injectors/modifyScriptSetup.js

@@ -6,7 +6,7 @@ export default function injector(code, script, keys) {
 }
 
 function rewrite(code, script, keys) {
-  // Throw error if useFusion is imported with an alias
+  // Throw an error if useFusion is imported with an alias.
   checkAliasedUseFusion(script.content);
 
   const originalContent = script.content;
@@ -18,13 +18,13 @@ function rewrite(code, script, keys) {
     throw new Error("Multiple useFusion calls are not allowed.");
   }
 
-  // Check if the user has any useFusion call in their code.
+  // Check if the user has any useFusion call.
   const hasUserCall = /useFusion\s*\(/.test(userCode);
   let rewritten = "";
   let remainingKeys = keys.slice();
 
   if (!hasUserCall) {
-    // No user call – insert an extra useFusion call that “imports” the placeholder.
+    // No user call – insert an extra call for the placeholder without the third parameter.
     rewritten = wrapWithFusionImport(
       userCode,
       "const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);"
@@ -43,24 +43,19 @@ function rewrite(code, script, keys) {
       // Parameterless call: assume the user wants all keys.
       rewritten = wrapWithFusionImport(
         userCode.replace(regex, (m, prefix) => {
-          return `${prefix}[${keys.map(k => `'${k}'`).join(',')}], __props.fusion)`;
+          return `${prefix}[${keys.map(k => `'${k}'`).join(',')}], __props.fusion, true)`;
         })
       );
       remainingKeys = [];
     } else {
       // User provided an explicit parameter array.
-      // Determine which keys they handled.
       const handledKeys = extractUseFusionParams(userCode);
       remainingKeys = handledKeys.includes("*")
         ? []
         : keys.filter(key => !handledKeys.includes(key));
 
-      // Rewrite the call to append __props.fusion)
       const modifiedCall = modifyUseFusionCalls(userCode, keys);
-
-      // For inline formatting (i.e. no newline in the array) we prepend an extra call
-      // to import the placeholder since the user is not importing all keys.
-      // For multiline formatting, we leave the call as-is.
+      // For inline formatting (no newline in the array), we insert an extra call above the user call.
       if (isMultiline) {
         rewritten = wrapWithFusionImport(modifiedCall);
       } else {
@@ -74,7 +69,7 @@ function rewrite(code, script, keys) {
 }
 
 function checkAliasedUseFusion(code) {
-  // Look for imports with curly braces and check if useFusion is aliased.
+  // Look for import statements with curly braces and check if useFusion is aliased.
   const regex = /import\s*{([^}]+)}/gm;
   let match;
   while ((match = regex.exec(code)) !== null) {
@@ -93,7 +88,7 @@ ${extraLine ? extraLine + "\n" : ""}${content}`;
 }
 
 function extractUseFusionParams(code) {
-  // This regex handles both inline and multiline array formatting.
+  // Modified regex to handle both inline and multiline arrays.
   const regex = /useFusion\s*\(\s*\[([\s\S]*?)\]\s*\)/g;
   let handledKeys = [];
   let match;
@@ -106,7 +101,7 @@ function extractUseFusionParams(code) {
       .filter(Boolean);
     handledKeys.push(...keysInCall);
   }
-  // If a useFusion() call exists with no parameters, treat it as handling all keys.
+  // If a useFusion call exists with no parameters, treat it as handling all keys.
   if (handledKeys.length === 0 && /useFusion\s*\(\s*\)/.test(code)) {
     return ["*"];
   }
@@ -117,9 +112,9 @@ function modifyUseFusionCalls(code, allKeys) {
   const regex = /(useFusion\s*\()(\s*\[[\s\S]*?\])?\s*\)/g;
   return code.replace(regex, (match, prefix, params) => {
     if (!params) {
-      return `${prefix}[${allKeys.map(k => `'${k}'`).join(',')}], __props.fusion)`;
+      return `${prefix}[${allKeys.map(k => `'${k}'`).join(',')}], __props.fusion, true)`;
     }
-    return `${prefix}${params}, __props.fusion)`;
+    return `${prefix}${params}, __props.fusion, true)`;
   });
 }
 

packages/vue/tests/modifyScriptSetup.test.js

@@ -70,7 +70,7 @@ describe('injector', () => {
     expect(remainingKeys).toEqual([]);
     expect(rewritten).toMatchCode(`
       import { useFusion } from "__aliasedFusionPath__";
-      const { data } = useFusion(['name','email'], __props.fusion);
+      const { data } = useFusion(['name','email'], __props.fusion, true);
     `);
   });
 
@@ -88,7 +88,7 @@ describe('injector', () => {
     expect(rewritten).toMatchCode(`
       import { useFusion } from "__aliasedFusionPath__";
       const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
-      const { data } = useFusion(['name'], __props.fusion);
+      const { data } = useFusion(['name'], __props.fusion, true);
     `);
   });
 
@@ -106,7 +106,7 @@ describe('injector', () => {
     expect(rewritten).toMatchCode(`
       import { useFusion } from "__aliasedFusionPath__";
       const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
-      const { data } = useFusion([], __props.fusion);
+      const { data } = useFusion([], __props.fusion, true);
     `);
   });
 
@@ -124,7 +124,7 @@ describe('injector', () => {
     expect(rewritten).toMatchCode(`
       import { useFusion } from "__aliasedFusionPath__";
       const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
-      const { data } = useFusion  (  ['name'], __props.fusion);
+      const { data } = useFusion  (  ['name'], __props.fusion, true);
     `);
   });
 
@@ -147,7 +147,7 @@ describe('injector', () => {
       const { data } = useFusion([
         'name',
         'email'
-      ], __props.fusion);
+      ], __props.fusion, true);
     `);
   });
 
@@ -169,7 +169,7 @@ describe('injector', () => {
       const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
       import { something } from 'somewhere';
       import another from 'another-place';
-      const { data } = useFusion(['name'], __props.fusion);
+      const { data } = useFusion(['name'], __props.fusion, true);
     `);
   });
 
@@ -187,7 +187,7 @@ describe('injector', () => {
     expect(rewritten).toMatchCode(`
       import { useFusion } from "__aliasedFusionPath__";
       const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
-      const { data } = useFusion(["name"], __props.fusion);
+      const { data } = useFusion(["name"], __props.fusion, true);
     `);
   });
 
@@ -205,7 +205,7 @@ describe('injector', () => {
     expect(rewritten).toMatchCode(`
       import { useFusion } from "__aliasedFusionPath__";
       const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
-      const { data } = useFusion(['name', "email"], __props.fusion);
+      const { data } = useFusion(['name', "email"], __props.fusion, true);
     `);
   });
 
@@ -241,7 +241,7 @@ describe('injector', () => {
     expect(rewritten).toMatchCode(`
     import { useFusion } from "__aliasedFusionPath__";
     const {__exportedKeysAsCsv__} = useFusion([__exportedKeysAsCsv__], __props.fusion);
-    const data = useFusion(['name',], __props.fusion);
+    const data = useFusion(['name',], __props.fusion, true);
   `);
   });