with-zephyr 0.0.0-canary.16 → 0.0.0-canary.18

package/dist/index.js

@@ -43515,7 +43515,10 @@ const parseClass = (glob, position)=>{
         true
     ];
 };
-const unescape_unescape = (s, { windowsPathsNoEscape = false } = {})=>windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, '$1') : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, '$1$2').replace(/\\([^\/])/g, '$1');
+const unescape_unescape = (s, { windowsPathsNoEscape = false, magicalBraces = true } = {})=>{
+    if (magicalBraces) return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, '$1') : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, '$1$2').replace(/\\([^\/])/g, '$1');
+    return windowsPathsNoEscape ? s.replace(/\[([^\/\\{}])\]/g, '$1') : s.replace(/((?!\\).|^)\[([^\/\\{}])\]/g, '$1$2').replace(/\\([^\/{}])/g, '$1');
+};
 const types = new Set([
     '!',
     '?',
@@ -43760,7 +43763,7 @@ class ast_AST {
         const dot = allowDot ?? !!this.#options.dot;
         if (this.#root === this) this.#fillNegs();
         if (!this.type) {
-            const noEmpty = this.isStart() && this.isEnd();
+            const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s)=>'string' != typeof s);
             const src = this.#parts.map((p)=>{
                 const [re, _, hasMagic, uflag] = 'string' == typeof p ? ast_AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
                 this.#hasMagic = this.#hasMagic || hasMagic;
@@ -43857,8 +43860,7 @@ class ast_AST {
                 }
             }
             if ('*' === c) {
-                if (noEmpty && '*' === glob) re += starNoEmpty;
-                else re += star;
+                re += noEmpty && '*' === glob ? starNoEmpty : star;
                 hasMagic = true;
                 continue;
             }
@@ -43877,7 +43879,10 @@ class ast_AST {
         ];
     }
 }
-const escape_escape = (s, { windowsPathsNoEscape = false } = {})=>windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, '[$&]') : s.replace(/[?*()[\]\\]/g, '\\$&');
+const escape_escape = (s, { windowsPathsNoEscape = false, magicalBraces = false } = {})=>{
+    if (magicalBraces) return windowsPathsNoEscape ? s.replace(/[?*()[\]{}]/g, '[$&]') : s.replace(/[?*()[\]\\{}]/g, '\\$&');
+    return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, '[$&]') : s.replace(/[?*()[\]\\]/g, '\\$&');
+};
 const minimatch = (p, pattern, options = {})=>{
     assertValidPattern(pattern);
     if (!options.nocomment && '#' === pattern.charAt(0)) return false;
@@ -44413,13 +44418,19 @@ class esm_Minimatch {
                 if (p !== GLOBSTAR || prev === GLOBSTAR) return;
                 if (void 0 === prev) if (void 0 !== next && next !== GLOBSTAR) pp[i + 1] = '(?:\\/|' + twoStar + '\\/)?' + next;
                 else pp[i] = twoStar;
-                else if (void 0 === next) pp[i - 1] = prev + '(?:\\/|' + twoStar + ')?';
+                else if (void 0 === next) pp[i - 1] = prev + '(?:\\/|\\/' + twoStar + ')?';
                 else if (next !== GLOBSTAR) {
                     pp[i - 1] = prev + '(?:\\/|\\/' + twoStar + '\\/)' + next;
                     pp[i + 1] = GLOBSTAR;
                 }
             });
-            return pp.filter((p)=>p !== GLOBSTAR).join('/');
+            const filtered = pp.filter((p)=>p !== GLOBSTAR);
+            if (this.partial && filtered.length >= 1) {
+                const prefixes = [];
+                for(let i = 1; i <= filtered.length; i++)prefixes.push(filtered.slice(0, i).join('/'));
+                return '(?:' + prefixes.join('|') + ')';
+            }
+            return filtered.join('/');
         }).join('|');
         const [open, close] = set.length > 1 ? [
             '(?:',
@@ -44429,6 +44440,7 @@ class esm_Minimatch {
             ''
         ];
         re = '^' + open + re + close + '$';
+        if (this.partial) re = '^(?:\\/|' + open + re.slice(1, -1) + close + ')$';
         if (this.negate) re = '^(?!' + re + ').+$';
         try {
             this.regexp = new RegExp(re, [
@@ -47923,17 +47935,17 @@ const astro_astroConfig = {
         {
             type: 'define-config-function',
             matcher: /defineConfig\s*\(\s*\(\s*\)\s*=>\s*\(\s*\{/,
-            transform: 'addToAstroIntegrationsInFunction'
+            transform: 'addToAstroIntegrationsInFunctionOrCreate'
         },
         {
             type: 'define-config',
             matcher: /defineConfig\s*\(\s*\{/,
-            transform: 'addToAstroIntegrations'
+            transform: 'addToAstroIntegrationsOrCreate'
         },
         {
             type: 'export-default',
             matcher: /export\s+default\s+\{/,
-            transform: 'addToAstroIntegrations'
+            transform: 'addToAstroIntegrationsOrCreate'
         }
     ]
 };
@@ -48489,6 +48501,71 @@ function addToAstroIntegrationsInFunction(ast) {
         }
     });
 }
+function addToAstroIntegrationsOrCreate(ast) {
+    let integrationAdded = false;
+    (0, traverse_lib["default"])(ast, {
+        CallExpression (path) {
+            if (types_lib.isIdentifier(path.node.callee, {
+                name: 'defineConfig'
+            }) && 1 === path.node.arguments.length && types_lib.isObjectExpression(path.node.arguments[0])) {
+                const configObject = path.node.arguments[0];
+                let integrationsProperty = null;
+                for (const prop of configObject.properties)if (types_lib.isObjectProperty(prop) && types_lib.isIdentifier(prop.key, {
+                    name: 'integrations'
+                }) && types_lib.isArrayExpression(prop.value)) {
+                    integrationsProperty = prop;
+                    break;
+                }
+                if (integrationsProperty && types_lib.isArrayExpression(integrationsProperty.value)) {
+                    integrationsProperty.value.elements.push(types_lib.callExpression(types_lib.identifier('withZephyr'), []));
+                    integrationAdded = true;
+                } else if (!integrationsProperty) {
+                    const newIntegrationsProperty = types_lib.objectProperty(types_lib.identifier('integrations'), types_lib.arrayExpression([
+                        types_lib.callExpression(types_lib.identifier('withZephyr'), [])
+                    ]));
+                    configObject.properties.push(newIntegrationsProperty);
+                    integrationAdded = true;
+                }
+            }
+        }
+    });
+    if (!integrationAdded) addToAstroIntegrations(ast);
+}
+function addToAstroIntegrationsInFunctionOrCreate(ast) {
+    let integrationAdded = false;
+    (0, traverse_lib["default"])(ast, {
+        CallExpression (path) {
+            if (types_lib.isIdentifier(path.node.callee, {
+                name: 'defineConfig'
+            }) && 1 === path.node.arguments.length && types_lib.isArrowFunctionExpression(path.node.arguments[0])) {
+                const arrowFunc = path.node.arguments[0];
+                let objExpr = null;
+                if (types_lib.isParenthesizedExpression(arrowFunc.body) && types_lib.isObjectExpression(arrowFunc.body.expression)) objExpr = arrowFunc.body.expression;
+                else if (types_lib.isObjectExpression(arrowFunc.body)) objExpr = arrowFunc.body;
+                if (objExpr) {
+                    let integrationsProperty = null;
+                    for (const prop of objExpr.properties)if (types_lib.isObjectProperty(prop) && types_lib.isIdentifier(prop.key, {
+                        name: 'integrations'
+                    }) && types_lib.isArrayExpression(prop.value)) {
+                        integrationsProperty = prop;
+                        break;
+                    }
+                    if (integrationsProperty && types_lib.isArrayExpression(integrationsProperty.value)) {
+                        integrationsProperty.value.elements.push(types_lib.callExpression(types_lib.identifier('withZephyr'), []));
+                        integrationAdded = true;
+                    } else if (!integrationsProperty) {
+                        const newIntegrationsProperty = types_lib.objectProperty(types_lib.identifier('integrations'), types_lib.arrayExpression([
+                            types_lib.callExpression(types_lib.identifier('withZephyr'), [])
+                        ]));
+                        objExpr.properties.push(newIntegrationsProperty);
+                        integrationAdded = true;
+                    }
+                }
+            }
+        }
+    });
+    if (!integrationAdded) addToAstroIntegrationsInFunction(ast);
+}
 function addToRollupFunction(ast) {
     (0, traverse_lib["default"])(ast, {
         ArrowFunctionExpression (path) {
@@ -48590,6 +48667,8 @@ const TRANSFORMERS = {
     addToVitePluginsInFunction: addToVitePluginsInFunction,
     addToAstroIntegrations: addToAstroIntegrations,
     addToAstroIntegrationsInFunction: addToAstroIntegrationsInFunction,
+    addToAstroIntegrationsOrCreate: addToAstroIntegrationsOrCreate,
+    addToAstroIntegrationsInFunctionOrCreate: addToAstroIntegrationsInFunctionOrCreate,
     addToRollupFunction: addToRollupFunction,
     addToRollupArrayConfig: addToRollupArrayConfig,
     wrapModuleExports: wrapModuleExports,

package/dist/zephyr-manifest.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0.0",
-  "timestamp": "2025-10-24T18:11:56.441Z",
+  "timestamp": "2025-11-26T13:30:31.254Z",
   "dependencies": {},
   "zeVars": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "with-zephyr",
-  "version": "0.0.0-canary.16",
+  "version": "0.0.0-canary.18",
   "description": "A codemod to automatically add withZephyr plugin to bundler configurations",
   "main": "dist/index.js",
   "repository": {
@@ -38,7 +38,7 @@
     "@types/node": "^24.5.2",
     "@rslib/core": "^0.13.3",
     "typescript": "^5.9.2",
-    "zephyr-rsbuild-plugin": "0.0.0-canary.16"
+    "zephyr-rsbuild-plugin": "0.0.0-canary.18"
   },
   "keywords": [
     "zephyr",