@gjsify/esbuild-plugin-gjsify 0.0.2 → 0.0.3

package/src/lib/{esm.ts → lib.ts}

@@ -1,4 +1,4 @@
-import { aliasPlugin } from '../alias-plugin.js';
+import { aliasPlugin } from '@gjsify/esbuild-plugin-alias';
 import { transformExtPlugin } from '@gjsify/esbuild-plugin-transform-ext';
 import { merge } from "lodash";
 import { getJsExtensions, globToEntryPoints } from "../utils/index.js";
@@ -7,16 +7,19 @@ import { getJsExtensions, globToEntryPoints } from "../utils/index.js";
 import type { PluginBuild, BuildOptions } from "esbuild";
 import type { PluginOptions } from '../types/plugin-options.js';
 
-export const setupEsmLib = async (build: PluginBuild, pluginOptions: PluginOptions) => {
+export const setupLib = async (build: PluginBuild, pluginOptions: PluginOptions) => {
+
+    const format = pluginOptions.format || 'esm';
 
     pluginOptions.aliases ||= {};
     pluginOptions.exclude ||= [];
 
     const esbuildOptions: BuildOptions = {
+        format,
         bundle: false,
         minify: false,
         sourcemap: false, 
-        splitting: true, // Works only on esm
+        splitting: format === 'esm' ? true : false, // Works only on esm
         loader: {
             '.ts': 'ts',
             '.mts': 'ts',
@@ -29,10 +32,10 @@ export const setupEsmLib = async (build: PluginBuild, pluginOptions: PluginOptio
             '.js': 'ts',
         },
         target: [ "esnext" ],
-        platform: "browser",
+        platform: "neutral",
+        mainFields: format === 'esm' ? ['module', 'main'] : ['main'],
         // https://esbuild.github.io/api/#conditions
-        conditions: ['module','import'],
-        format: 'esm'
+        conditions: format === 'esm' ? ['module','import'] : ['require'],
     };
 
     merge(build.initialOptions, esbuildOptions);

package/src/lodash.d.ts

@@ -0,0 +1,46 @@
+declare module 'lodash' {
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    function merge<TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    /**
+     * @see _.merge
+     */
+    function merge<TObject, TSource1, TSource2>(object: TObject, source1: TSource1, source2: TSource2): TObject & TSource1 & TSource2;
+    /**
+     * @see _.merge
+     */
+    function merge<TObject, TSource1, TSource2, TSource3>(object: TObject, source1: TSource1, source2: TSource2, source3: TSource3): TObject & TSource1 & TSource2 & TSource3;
+    /**
+     * @see _.merge
+     */
+    function merge<TObject, TSource1, TSource2, TSource3, TSource4>(object: TObject, source1: TSource1, source2: TSource2, source3: TSource3, source4: TSource4): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+    /**
+     * @see _.merge
+     */
+    function merge(object: any, ...otherArgs: any[]): any;
+}

package/src/plugin.ts

@@ -1,6 +1,6 @@
 import type { Plugin } from "esbuild";
 import type { PluginOptions } from './types/plugin-options.js';
-import { setupCjsLib, setupEsmLib } from './lib/index.js';
+import { setupLib } from './lib/index.js';
 import { setupForGjs, setupForNode, setupForDeno, setupForBrowser } from './app/index.js';
 
 export const gjsifyPlugin = (pluginOptions: PluginOptions = {}) => {
@@ -12,9 +12,8 @@ export const gjsifyPlugin = (pluginOptions: PluginOptions = {}) => {
             if(pluginOptions.library) {
                 switch (pluginOptions.library) {
                     case 'esm':
-                        return setupEsmLib(build, pluginOptions)
                     case 'cjs':
-                        return setupCjsLib(build, pluginOptions)
+                        return setupLib(build, pluginOptions)
                     default:
                         throw new TypeError('Unknown library type: ' + pluginOptions.library);
                 }

package/src/types/plugin-options.ts

@@ -8,7 +8,7 @@ export interface PluginOptions extends DeepkitPluginOptions {
     /** An array of glob patterns to exclude matches and aliases */
     exclude?: string[];
     jsExtension?: string;
-    /** Override the format, only be considered if the target app platform is `'node'`, otherwise it is always `'esm'` */
+    /** Override the format */
     format?: 'esm' | 'cjs'
     /** 
      * Library Mode

package/src/utils/extension.ts

@@ -1,6 +1,6 @@
-export const getJsExtensions = (allowExt: string) => {
+export const getJsExtensions = (allowExt?: string) => {
     const extensions = {'.js': '.js', '.ts': '.js', '.mts': '.js', '.cts': '.js', '.cjs': '.js', '.mjs': '.js'};
-    if(extensions[allowExt]) {
+    if(allowExt && extensions[allowExt]) {
         delete extensions[allowExt]
     }
     return extensions;

package/tsconfig.json

@@ -3,11 +3,15 @@
     "module": "ESNext",
     "target": "ESNext",
     "outDir": "dist",
+    "types": ["node"],
+    "lib": ["ESNext", "DOM"],
     "declarationDir": "dist/types",
     "declaration": true,
+    "emitDeclarationOnly": true,
     "allowSyntheticDefaultImports": true,
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true
   },
+  "include": ["src/lodash.d.ts"],
   "files": ["src/index.ts"]
 }

package/dist/types/debug-plugin.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from "esbuild";
-export declare const debugPlugin: () => Plugin;

package/dist/types/lib/esm.d.ts

@@ -1,3 +0,0 @@
-import type { PluginBuild } from "esbuild";
-import type { PluginOptions } from '../types/plugin-options.js';
-export declare const setupEsmLib: (build: PluginBuild, pluginOptions: PluginOptions) => Promise<void>;

package/src/alias-plugin.ts

@@ -1,68 +0,0 @@
-import { existsSync } from "fs";
-import { realpath } from "fs/promises";
-
-import type { Plugin } from "esbuild";
-
-export const aliasPlugin = (aliasObj: Record<string, string>) => {
-  const aliases = Object.keys(aliasObj);
-  const re = new RegExp(`^(${aliases.map(x => escapeRegExp(x)).join('|')})$`);
-
-  const plugin: Plugin = {
-    name: 'alias',
-    setup(build) {
-      // we do not register 'file' namespace here, because the root file won't be processed
-      // https://github.com/evanw/esbuild/issues/791
-      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)
-          } else {
-            const resolvedAlias = (await build.resolve(resolvedAliasPath, {
-              importer: args.importer,
-              kind: args.kind,
-              namespace: namespace,
-              resolveDir: args.resolveDir,
-              pluginData: args.pluginData,
-            }));
-
-            if (resolvedAlias.errors) {
-              return resolvedAlias;
-            } else {
-              resolvedAliasPath = resolvedAlias.path;
-              namespace = resolvedAlias.namespace;
-            }
-          }
-
-          if (existsSync(resolvedAliasPath)) {
-            resolvedAliasPath = await realpath(resolvedAliasPath);
-          }
-
-          // console.debug(`resolvedAliasPath: ${args.path} -> ${resolvedAliasPath}`);
-
-          return {
-            path: resolvedAliasPath,
-            namespace: namespace,
-          }
-        }
-
-        return null;
-      });
-    },
-  };
-
-  return plugin;
-};
-
-function escapeRegExp(str: string) {
-  // $& means the whole matched string
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}

package/src/lib/cjs.ts

@@ -1,46 +0,0 @@
-import { aliasPlugin } from '../alias-plugin.js';
-import { transformExtPlugin } from '@gjsify/esbuild-plugin-transform-ext';
-import { merge } from "lodash";
-import { getJsExtensions, globToEntryPoints } from "../utils/index.js";
-
-// Types
-import type { PluginBuild, BuildOptions } from "esbuild";
-import type { PluginOptions } from '../types/plugin-options.js';
-
-export const setupCjsLib = async (build: PluginBuild, pluginOptions: PluginOptions) => {
-
-    pluginOptions.aliases ||= {};
-    pluginOptions.exclude ||= [];
-
-    const esbuildOptions: BuildOptions = {
-        bundle: false,
-        splitting: false, // only works with esm, see https://esbuild.github.io/api/#splitting
-        minify: false,
-        sourcemap: false,
-        loader: {
-            '.ts': 'ts',
-            '.mts': 'ts',
-            '.cts': 'ts',
-            '.tsx': 'ts',
-            '.mtsx': 'ts',
-            '.ctsx': 'ts',
-            '.mjs': 'ts',
-            '.cjs': 'ts',
-            '.js': 'ts',
-        },
-        target: ['esnext'],
-        platform: "browser",
-        // https://esbuild.github.io/api/#conditions
-        conditions: ['require'],
-        format: 'cjs'
-    };
-
-    merge(build.initialOptions, esbuildOptions);
-
-    build.initialOptions.entryPoints = await globToEntryPoints(build.initialOptions.entryPoints, pluginOptions.exclude)
-
-    if(pluginOptions.debug) console.debug("initialOptions", build.initialOptions);
-
-    await aliasPlugin(pluginOptions.aliases).setup(build);
-    await transformExtPlugin({ outExtension: getJsExtensions(pluginOptions.jsExtension) }).setup(build);
-}