@gjsify/esbuild-plugin-gjsify 0.0.3 → 0.0.4

package/dist/esm/index.mjs

@@ -9,7 +9,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 }) : x)(function(x) {
   if (typeof require !== "undefined")
     return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
@@ -101,10 +101,15 @@ var require_path = __commonJS({
   "../../../node_modules/fast-glob/out/utils/path.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.removeLeadingDotSegment = exports.escape = exports.makeAbsolute = exports.unixify = void 0;
+    exports.convertPosixPathToPattern = exports.convertWindowsPathToPattern = exports.convertPathToPattern = exports.escapePosixPath = exports.escapeWindowsPath = exports.escape = exports.removeLeadingDotSegment = exports.makeAbsolute = exports.unixify = void 0;
+    var os = __require("os");
     var path = __require("path");
+    var IS_WINDOWS_PLATFORM = os.platform() === "win32";
     var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2;
-    var UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\())/g;
+    var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g;
+    var WINDOWS_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()[\]{}]|^!|[!+@](?=\())/g;
+    var DOS_DEVICE_PATH_RE = /^\\\\([.?])/;
+    var WINDOWS_BACKSLASHES_RE = /\\(?![!()+@[\]{}])/g;
     function unixify(filepath) {
       return filepath.replace(/\\/g, "/");
     }
@@ -113,10 +118,6 @@ var require_path = __commonJS({
       return path.resolve(cwd, filepath);
     }
     exports.makeAbsolute = makeAbsolute;
-    function escape(pattern) {
-      return pattern.replace(UNESCAPED_GLOB_SYMBOLS_RE, "\\$2");
-    }
-    exports.escape = escape;
     function removeLeadingDotSegment(entry) {
       if (entry.charAt(0) === ".") {
         const secondCharactery = entry.charAt(1);
@@ -127,6 +128,24 @@ var require_path = __commonJS({
       return entry;
     }
     exports.removeLeadingDotSegment = removeLeadingDotSegment;
+    exports.escape = IS_WINDOWS_PLATFORM ? escapeWindowsPath : escapePosixPath;
+    function escapeWindowsPath(pattern) {
+      return pattern.replace(WINDOWS_UNESCAPED_GLOB_SYMBOLS_RE, "\\$2");
+    }
+    exports.escapeWindowsPath = escapeWindowsPath;
+    function escapePosixPath(pattern) {
+      return pattern.replace(POSIX_UNESCAPED_GLOB_SYMBOLS_RE, "\\$2");
+    }
+    exports.escapePosixPath = escapePosixPath;
+    exports.convertPathToPattern = IS_WINDOWS_PLATFORM ? convertWindowsPathToPattern : convertPosixPathToPattern;
+    function convertWindowsPathToPattern(filepath) {
+      return escapeWindowsPath(filepath).replace(DOS_DEVICE_PATH_RE, "//$1").replace(WINDOWS_BACKSLASHES_RE, "/");
+    }
+    exports.convertWindowsPathToPattern = convertWindowsPathToPattern;
+    function convertPosixPathToPattern(filepath) {
+      return escapePosixPath(filepath);
+    }
+    exports.convertPosixPathToPattern = convertPosixPathToPattern;
   }
 });
 
@@ -3106,7 +3125,7 @@ var require_pattern = __commonJS({
   "../../../node_modules/fast-glob/out/utils/pattern.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
+    exports.removeDuplicateSlashes = exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
     var path = __require("path");
     var globParent = require_glob_parent();
     var micromatch = require_micromatch();
@@ -3117,6 +3136,7 @@ var require_pattern = __commonJS({
     var REGEX_GROUP_SYMBOLS_RE = /(?:^|[^!*+?@])\([^(]*\|[^|]*\)/;
     var GLOB_EXTENSION_SYMBOLS_RE = /[!*+?@]\([^(]*\)/;
     var BRACE_EXPANSION_SEPARATORS_RE = /,|\.\./;
+    var DOUBLE_SLASH_RE = /(?!^)\/{2,}/g;
     function isStaticPattern(pattern, options = {}) {
       return !isDynamicPattern(pattern, options);
     }
@@ -3212,10 +3232,9 @@ var require_pattern = __commonJS({
     }
     exports.expandPatternsWithBraceExpansion = expandPatternsWithBraceExpansion;
     function expandBraceExpansion(pattern) {
-      return micromatch.braces(pattern, {
-        expand: true,
-        nodupes: true
-      });
+      const patterns = micromatch.braces(pattern, { expand: true, nodupes: true, keepEscaping: true });
+      patterns.sort((a, b) => a.length - b.length);
+      return patterns.filter((pattern2) => pattern2 !== "");
     }
     exports.expandBraceExpansion = expandBraceExpansion;
     function getPatternParts(pattern, options) {
@@ -3242,6 +3261,10 @@ var require_pattern = __commonJS({
       return patternsRe.some((patternRe) => patternRe.test(entry));
     }
     exports.matchAny = matchAny;
+    function removeDuplicateSlashes(pattern) {
+      return pattern.replace(DOUBLE_SLASH_RE, "/");
+    }
+    exports.removeDuplicateSlashes = removeDuplicateSlashes;
   }
 });
 
@@ -3434,9 +3457,11 @@ var require_tasks = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
     var utils = require_utils3();
-    function generate(patterns, settings) {
+    function generate(input, settings) {
+      const patterns = processPatterns(input, settings);
+      const ignore = processPatterns(settings.ignore, settings);
       const positivePatterns = getPositivePatterns(patterns);
-      const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
+      const negativePatterns = getNegativePatternsAsPositive(patterns, ignore);
       const staticPatterns = positivePatterns.filter((pattern) => utils.pattern.isStaticPattern(pattern, settings));
       const dynamicPatterns = positivePatterns.filter((pattern) => utils.pattern.isDynamicPattern(pattern, settings));
       const staticTasks = convertPatternsToTasks(
@@ -3454,6 +3479,16 @@ var require_tasks = __commonJS({
       return staticTasks.concat(dynamicTasks);
     }
     exports.generate = generate;
+    function processPatterns(input, settings) {
+      let patterns = input;
+      if (settings.braceExpansion) {
+        patterns = utils.pattern.expandPatternsWithBraceExpansion(patterns);
+      }
+      if (settings.baseNameMatch) {
+        patterns = patterns.map((pattern) => pattern.includes("/") ? pattern : `**/${pattern}`);
+      }
+      return patterns.map((pattern) => utils.pattern.removeDuplicateSlashes(pattern));
+    }
     function convertPatternsToTasks(positive, negative, dynamic) {
       const tasks = [];
       const patternsOutsideCurrentDirectory = utils.pattern.getPatternsOutsideCurrentDirectory(positive);
@@ -3511,24 +3546,6 @@ var require_tasks = __commonJS({
   }
 });
 
-// ../../../node_modules/fast-glob/out/managers/patterns.js
-var require_patterns = __commonJS({
-  "../../../node_modules/fast-glob/out/managers/patterns.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.removeDuplicateSlashes = exports.transform = void 0;
-    var DOUBLE_SLASH_RE = /(?!^)\/{2,}/g;
-    function transform(patterns) {
-      return patterns.map((pattern) => removeDuplicateSlashes(pattern));
-    }
-    exports.transform = transform;
-    function removeDuplicateSlashes(pattern) {
-      return pattern.replace(DOUBLE_SLASH_RE, "/");
-    }
-    exports.removeDuplicateSlashes = removeDuplicateSlashes;
-  }
-});
-
 // ../../../node_modules/@nodelib/fs.stat/out/providers/async.js
 var require_async = __commonJS({
   "../../../node_modules/@nodelib/fs.stat/out/providers/async.js"(exports) {
@@ -4876,8 +4893,7 @@ var require_matcher = __commonJS({
         this._fillStorage();
       }
       _fillStorage() {
-        const patterns = utils.pattern.expandPatternsWithBraceExpansion(this._patterns);
-        for (const pattern of patterns) {
+        for (const pattern of this._patterns) {
           const segments = this._getPatternSegments(pattern);
           const sections = this._splitSegmentsIntoSections(segments);
           this._storage.push({
@@ -5029,32 +5045,32 @@ var require_entry = __commonJS({
       }
       getFilter(positive, negative) {
         const positiveRe = utils.pattern.convertPatternsToRe(positive, this._micromatchOptions);
-        const negativeRe = utils.pattern.convertPatternsToRe(negative, this._micromatchOptions);
+        const negativeRe = utils.pattern.convertPatternsToRe(negative, Object.assign(Object.assign({}, this._micromatchOptions), { dot: true }));
         return (entry) => this._filter(entry, positiveRe, negativeRe);
       }
       _filter(entry, positiveRe, negativeRe) {
-        if (this._settings.unique && this._isDuplicateEntry(entry)) {
+        const filepath = utils.path.removeLeadingDotSegment(entry.path);
+        if (this._settings.unique && this._isDuplicateEntry(filepath)) {
           return false;
         }
         if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
           return false;
         }
-        if (this._isSkippedByAbsoluteNegativePatterns(entry.path, negativeRe)) {
+        if (this._isSkippedByAbsoluteNegativePatterns(filepath, negativeRe)) {
           return false;
         }
-        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
         const isDirectory = entry.dirent.isDirectory();
-        const isMatched = this._isMatchToPatterns(filepath, positiveRe, isDirectory) && !this._isMatchToPatterns(entry.path, negativeRe, isDirectory);
+        const isMatched = this._isMatchToPatterns(filepath, positiveRe, isDirectory) && !this._isMatchToPatterns(filepath, negativeRe, isDirectory);
         if (this._settings.unique && isMatched) {
-          this._createIndexRecord(entry);
+          this._createIndexRecord(filepath);
         }
         return isMatched;
       }
-      _isDuplicateEntry(entry) {
-        return this.index.has(entry.path);
+      _isDuplicateEntry(filepath) {
+        return this.index.has(filepath);
       }
-      _createIndexRecord(entry) {
-        this.index.set(entry.path, void 0);
+      _createIndexRecord(filepath) {
+        this.index.set(filepath, void 0);
       }
       _onlyFileFilter(entry) {
         return this._settings.onlyFiles && !entry.dirent.isFile();
@@ -5069,8 +5085,7 @@ var require_entry = __commonJS({
         const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
         return utils.pattern.matchAny(fullpath, patternsRe);
       }
-      _isMatchToPatterns(entryPath, patternsRe, isDirectory) {
-        const filepath = utils.path.removeLeadingDotSegment(entryPath);
+      _isMatchToPatterns(filepath, patternsRe, isDirectory) {
         const isMatched = utils.pattern.matchAny(filepath, patternsRe);
         if (!isMatched && isDirectory) {
           return utils.pattern.matchAny(filepath + "/", patternsRe);
@@ -5376,6 +5391,7 @@ var require_settings4 = __commonJS({
         if (this.stats) {
           this.objectMode = true;
         }
+        this.ignore = [].concat(this.ignore);
       }
       _getValue(option, value) {
         return option === void 0 ? value : option;
@@ -5393,7 +5409,6 @@ var require_out4 = __commonJS({
   "../../../node_modules/fast-glob/out/index.js"(exports, module) {
     "use strict";
     var taskManager = require_tasks();
-    var patternManager = require_patterns();
     var async_1 = require_async6();
     var stream_1 = require_stream4();
     var sync_1 = require_sync6();
@@ -5406,6 +5421,10 @@ var require_out4 = __commonJS({
       return utils.array.flatten(result);
     }
     (function(FastGlob2) {
+      FastGlob2.glob = FastGlob2;
+      FastGlob2.globSync = sync;
+      FastGlob2.globStream = stream;
+      FastGlob2.async = FastGlob2;
       function sync(source, options) {
         assertPatternsInput(source);
         const works = getWorks(source, sync_1.default, options);
@@ -5420,7 +5439,7 @@ var require_out4 = __commonJS({
       FastGlob2.stream = stream;
       function generateTasks(source, options) {
         assertPatternsInput(source);
-        const patterns = patternManager.transform([].concat(source));
+        const patterns = [].concat(source);
         const settings = new settings_1.default(options);
         return taskManager.generate(patterns, settings);
       }
@@ -5436,9 +5455,40 @@ var require_out4 = __commonJS({
         return utils.path.escape(source);
       }
       FastGlob2.escapePath = escapePath;
+      function convertPathToPattern(source) {
+        assertPatternsInput(source);
+        return utils.path.convertPathToPattern(source);
+      }
+      FastGlob2.convertPathToPattern = convertPathToPattern;
+      let posix;
+      (function(posix2) {
+        function escapePath2(source) {
+          assertPatternsInput(source);
+          return utils.path.escapePosixPath(source);
+        }
+        posix2.escapePath = escapePath2;
+        function convertPathToPattern2(source) {
+          assertPatternsInput(source);
+          return utils.path.convertPosixPathToPattern(source);
+        }
+        posix2.convertPathToPattern = convertPathToPattern2;
+      })(posix = FastGlob2.posix || (FastGlob2.posix = {}));
+      let win32;
+      (function(win322) {
+        function escapePath2(source) {
+          assertPatternsInput(source);
+          return utils.path.escapeWindowsPath(source);
+        }
+        win322.escapePath = escapePath2;
+        function convertPathToPattern2(source) {
+          assertPatternsInput(source);
+          return utils.path.convertWindowsPathToPattern(source);
+        }
+        win322.convertPathToPattern = convertPathToPattern2;
+      })(win32 = FastGlob2.win32 || (FastGlob2.win32 = {}));
     })(FastGlob || (FastGlob = {}));
     function getWorks(source, _Provider, options) {
-      const patterns = patternManager.transform([].concat(source));
+      const patterns = [].concat(source);
       const settings = new settings_1.default(options);
       const tasks = taskManager.generate(patterns, settings);
       const provider = new _Provider(settings);
@@ -5494,37 +5544,38 @@ var require_cjs = __commonJS({
           build.onResolve({ filter: re }, async (args) => {
             let resolvedAliasPath = aliasObj[args.path];
             let namespace = args.namespace;
-            if (resolvedAliasPath) {
-              if (resolvedAliasPath.startsWith("http://")) {
-                namespace = "http";
-                resolvedAliasPath = resolvedAliasPath.slice(5);
-              } else if (resolvedAliasPath.startsWith("https://")) {
-                namespace = "https";
-                resolvedAliasPath = resolvedAliasPath.slice(6);
+            if (!resolvedAliasPath) {
+              return null;
+            }
+            if (resolvedAliasPath.startsWith("http://")) {
+              namespace = "http";
+              resolvedAliasPath = resolvedAliasPath.slice(5);
+            } else if (resolvedAliasPath.startsWith("https://")) {
+              namespace = "https";
+              resolvedAliasPath = resolvedAliasPath.slice(6);
+            } else {
+              const resolvedAlias = await build.resolve(resolvedAliasPath, {
+                importer: args.importer,
+                kind: args.kind,
+                namespace,
+                resolveDir: args.resolveDir,
+                pluginData: args.pluginData
+              });
+              if (resolvedAlias.errors.length > 0) {
+                console.error(resolvedAlias.errors);
+                return resolvedAlias;
               } else {
-                const resolvedAlias = await build.resolve(resolvedAliasPath, {
-                  importer: args.importer,
-                  kind: args.kind,
-                  namespace,
-                  resolveDir: args.resolveDir,
-                  pluginData: args.pluginData
-                });
-                if (resolvedAlias.errors) {
-                  return resolvedAlias;
-                } else {
-                  resolvedAliasPath = resolvedAlias.path;
-                  namespace = resolvedAlias.namespace;
-                }
+                resolvedAliasPath = resolvedAlias.path;
+                namespace = resolvedAlias.namespace;
               }
-              if ((0, import_fs.existsSync)(resolvedAliasPath)) {
-                resolvedAliasPath = await (0, import_promises.realpath)(resolvedAliasPath);
-              }
-              return {
-                path: resolvedAliasPath,
-                namespace
-              };
             }
-            return null;
+            if ((0, import_fs.existsSync)(resolvedAliasPath)) {
+              resolvedAliasPath = await (0, import_promises.realpath)(resolvedAliasPath);
+            }
+            return {
+              path: resolvedAliasPath,
+              namespace
+            };
           });
         }
       };
@@ -6267,7 +6318,7 @@ var require_lodash = __commonJS({
           }
           return new LodashWrapper(value);
         }
-        var baseCreate = function() {
+        var baseCreate = /* @__PURE__ */ function() {
           function object() {
           }
           return function(proto) {
@@ -9574,7 +9625,7 @@ var require_lodash = __commonJS({
         var gte = createRelationalOperation(function(value, other) {
           return value >= other;
         });
-        var isArguments = baseIsArguments(function() {
+        var isArguments = baseIsArguments(/* @__PURE__ */ function() {
           return arguments;
         }()) ? baseIsArguments : function(value) {
           return isObjectLike(value) && hasOwnProperty.call(value, "callee") && !propertyIsEnumerable.call(value, "callee");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/esbuild-plugin-gjsify",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Deepkit type compiler plugin for esbuild",
   "type": "module",
   "main": "dist/cjs/index.cjs",
@@ -20,15 +20,15 @@
     "esbuild"
   ],
   "dependencies": {
-    "@gjsify/esbuild-plugin-alias": "^0.0.3",
-    "@gjsify/esbuild-plugin-deepkit": "^0.0.3",
-    "@gjsify/esbuild-plugin-deno-loader": "^0.0.3",
-    "@gjsify/esbuild-plugin-transform-ext": "^0.0.3",
-    "fast-glob": "^3.2.12",
+    "@gjsify/esbuild-plugin-alias": "^0.0.4",
+    "@gjsify/esbuild-plugin-deepkit": "^0.0.4",
+    "@gjsify/esbuild-plugin-deno-loader": "^0.0.4",
+    "@gjsify/esbuild-plugin-transform-ext": "^0.0.4",
+    "fast-glob": "^3.3.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "esbuild": "^0.18.3",
-    "typescript": "^5.1.3"
+    "esbuild": "^0.19.10",
+    "typescript": "^5.3.3"
   }
 }

package/src/plugin.ts

@@ -7,7 +7,6 @@ export const gjsifyPlugin = (pluginOptions: PluginOptions = {}) => {
     const plugin: Plugin = {
         name: 'gjsify',
         async setup(build) {
-
             // Library mode
             if(pluginOptions.library) {
                 switch (pluginOptions.library) {
@@ -19,7 +18,7 @@ export const gjsifyPlugin = (pluginOptions: PluginOptions = {}) => {
                 }
             }
 
-            pluginOptions.app ||= 'gjs';
+            pluginOptions.app ||= 'gjs'
             
             // End user applications or tests
             switch (pluginOptions.app) {