@driveflux/fab 1.0.0-next.0 → 1.0.0-next.2

package/.turbo/turbo-build.log

@@ -1,13 +1,14 @@
-
-> @driveflux/fab@1.0.0-next.0 build /Users/flux/Projects/flux/packages/fab
-> pnpm build:js && pnpm build:types
-
-
-> @driveflux/fab@1.0.0-next.0 build:js /Users/flux/Projects/flux/packages/fab
-> swc src -d dist
-
-Successfully compiled: 7 files with swc (69.51ms)
-
-> @driveflux/fab@1.0.0-next.0 build:types /Users/flux/Projects/flux/packages/fab
-> tsc --build --emitDeclarationOnly
-
+
+
+> @driveflux/fab@1.0.0-next.2 build /Users/flux/Projects/flux/packages/fab
+> pnpm build:js && pnpm build:types
+
+
+> @driveflux/fab@1.0.0-next.2 build:js /Users/flux/Projects/flux/packages/fab
+> swc src --strip-leading-paths -d dist
+
+Successfully compiled: 7 files with swc (224.42ms)
+
+> @driveflux/fab@1.0.0-next.2 build:types /Users/flux/Projects/flux/packages/fab
+> tsc --build --emitDeclarationOnly
+

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @driveflux/fab
 
+## 1.0.0-next.2
+
+### Patch Changes
+
+- Version bump
+
+## 1.0.0-next.1
+
+### Patch Changes
+
+- verion bump + minor improvements
+
 ## 1.0.0-next.0
 
 ### Major Changes

package/bin/fab.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 // @ts-check
-import { Argument, Command, Option } from 'commander'
+import { Command, Option } from 'commander'
 import path from 'node:path'
 import { build, buildCjs, buildEsm, buildTypes, clean, create, makeBaseExports, parseConfig } from '../index.js'
 const program = new Command()
@@ -37,12 +37,13 @@ function makeBuildCommand() {
       'The exports definition as an alternative to package.json. It must be the same structure as "exports"',
       parseExports
     )
-    .addArgument(
-      new Argument('[command]', 'The command to run')
+    .addOption(
+      new Option('-t, --target [...target]', 'The target export to make')
         .choices(['all', 'esm', 'cjs', 'types', 'clean', 'cjs-exports'])
         .default('all')
     )
-    .action(async (command, options) => {
+    .action(async (options) => {
+      const { target } = options
       const cwd = path.resolve(process.cwd(), options.cwd)
       const config = await parseConfig({ cwd })
 
@@ -56,7 +57,7 @@ function makeBuildCommand() {
         ...config,
       }
 
-      switch (command) {
+      switch (target) {
         case 'all':
           await build(finalOptions)
           break
@@ -73,7 +74,7 @@ function makeBuildCommand() {
           await buildTypes(finalOptions)
           break
         default:
-          throw new Error(`Unknown command ${command}`)
+          throw new Error(`Unknown target ${target}`)
       }
     })
 }

package/dist/build.d.ts

@@ -5,15 +5,17 @@ interface BuildOptions extends BaseOptions, MakeBaseExportsOptions, CleanOptions
     noTypes?: boolean;
     noCJS?: boolean;
     noESM?: boolean;
+    copyVerbatim?: string[];
 }
 interface MakeBaseExportsOptions extends BaseOptions {
     noTypes?: boolean;
     exports?: PackageJson['exports'];
 }
-export declare const build: (options?: BuildOptions) => Promise<void>;
-export declare const buildTypes: (options?: BaseOptions) => Promise<void>;
-export declare const buildCjs: (options?: BaseOptions) => Promise<void>;
-export declare const makeBaseExports: (options?: MakeBaseExportsOptions) => Promise<string[]>;
-export declare const buildEsm: (options?: BaseOptions) => Promise<void>;
+export declare const build: (rawOptions?: BuildOptions) => Promise<void>;
+export declare const copyVerbatim: (rawOptions?: BuildOptions) => Promise<void>;
+export declare const buildTypes: (rawOptions?: BaseOptions) => Promise<void>;
+export declare const buildCjs: (rawOptions?: BaseOptions) => Promise<void>;
+export declare const makeBaseExports: (rawOptions?: MakeBaseExportsOptions) => Promise<string[]>;
+export declare const buildEsm: (rawOptions?: BaseOptions) => Promise<void>;
 export {};
 //# sourceMappingURL=build.d.ts.map

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAS,MAAM,YAAY,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK7C,UAAU,YAAa,SAAQ,WAAW,EAAE,sBAAsB,EAAE,YAAY;IAC9E,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,UAAU,sBAAuB,SAAQ,WAAW;IAClD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;CACjC;AAaD,eAAO,MAAM,KAAK,aAAmB,YAAY,kBAsBhD,CAAA;AAED,eAAO,MAAM,UAAU,aAAmB,WAAW,kBAGpD,CAAA;AAED,eAAO,MAAM,QAAQ,aAAmB,WAAW,kBAelD,CAAA;AAED,eAAO,MAAM,eAAe,aAAmB,sBAAsB,sBAmBpE,CAAA;AAwKD,eAAO,MAAM,QAAQ,aAAmB,WAAW,kBAIlD,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAS,MAAM,YAAY,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAK7C,UAAU,YAAa,SAAQ,WAAW,EAAE,sBAAsB,EAAE,YAAY;IAC9E,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,UAAU,sBAAuB,SAAQ,WAAW;IAClD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;CACjC;AAaD,eAAO,MAAM,KAAK,gBAAuB,YAAY,kBA2BpD,CAAA;AAED,eAAO,MAAM,YAAY,gBAAuB,YAAY,kBAc3D,CAAA;AAED,eAAO,MAAM,UAAU,gBAAuB,WAAW,kBAIxD,CAAA;AAED,eAAO,MAAM,QAAQ,gBAAuB,WAAW,kBAgBtD,CAAA;AAED,eAAO,MAAM,eAAe,gBAAuB,sBAAsB,sBAoBxE,CAAA;AAgLD,eAAO,MAAM,QAAQ,gBAAuB,WAAW,kBAKtD,CAAA"}

package/dist/build.js

@@ -169,6 +169,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 import fg from "fast-glob";
+import merge from "lodash.merge";
 import assert from "node:assert";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -176,13 +177,12 @@ import { clean } from "./clean.js";
 import { ensureDir, getDefaultOptions, runCommand, validatePackageJson } from "./utils.js";
 var glob = fg.glob;
 export var build = function() {
-    var _ref = _async_to_generator(function() {
+    var _ref = _async_to_generator(function(rawOptions) {
         var options, promises;
-        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : getDefaultOptions();
+                    options = merge({}, getDefaultOptions(), rawOptions);
                     // Cleanup first
                     return [
                         4,
@@ -200,6 +200,7 @@ export var build = function() {
                     if (!options.noCJS) {
                         promises.push(buildCjs(options));
                     }
+                    promises.push(copyVerbatim(options));
                     // Build necessary files
                     return [
                         4,
@@ -207,31 +208,106 @@ export var build = function() {
                     ];
                 case 2:
                     _state.sent();
-                    // Make exports for CJS
+                    if (!!options.noCJS) return [
+                        3,
+                        4
+                    ];
                     return [
                         4,
                         makeBaseExports(options)
                     ];
                 case 3:
                     _state.sent();
+                    _state.label = 4;
+                case 4:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function build(rawOptions) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export var copyVerbatim = function() {
+    var _ref = _async_to_generator(function(rawOptions) {
+        var _options_copyVerbatim, options, _options_cwd, cwd, _options_destination, destination;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    options = merge({}, getDefaultOptions(), rawOptions);
+                    if (!((_options_copyVerbatim = options.copyVerbatim) === null || _options_copyVerbatim === void 0 ? void 0 : _options_copyVerbatim.length)) return [
+                        3,
+                        2
+                    ];
+                    cwd = (_options_cwd = options.cwd) !== null && _options_cwd !== void 0 ? _options_cwd : process.cwd();
+                    destination = (_options_destination = options.destination) !== null && _options_destination !== void 0 ? _options_destination : getDefaultOptions().destination;
+                    return [
+                        4,
+                        Promise.all(options.copyVerbatim.map(function() {
+                            var _ref = _async_to_generator(function(fileOrFolderRaw) {
+                                var fileOrFolder, targetPath, targetPathCjs;
+                                return _ts_generator(this, function(_state) {
+                                    switch(_state.label){
+                                        case 0:
+                                            fileOrFolder = "src/".concat(fileOrFolderRaw.replace(/^(\/)*src/, ""));
+                                            targetPath = path.resolve(destination, fileOrFolder).replace("/src", "");
+                                            targetPathCjs = path.resolve(destination, "cjs", fileOrFolder).replace("/src", "");
+                                            return [
+                                                4,
+                                                ensureDir(path.dirname(targetPath))
+                                            ];
+                                        case 1:
+                                            _state.sent();
+                                            return [
+                                                4,
+                                                fs.cp(path.resolve(cwd, fileOrFolder), targetPath, {
+                                                    recursive: true
+                                                })
+                                            ];
+                                        case 2:
+                                            _state.sent();
+                                            return [
+                                                4,
+                                                fs.cp(path.resolve(cwd, fileOrFolder), targetPathCjs, {
+                                                    recursive: true
+                                                })
+                                            ];
+                                        case 3:
+                                            _state.sent();
+                                            return [
+                                                2
+                                            ];
+                                    }
+                                });
+                            });
+                            return function(fileOrFolderRaw) {
+                                return _ref.apply(this, arguments);
+                            };
+                        }()))
+                    ];
+                case 1:
+                    _state.sent();
+                    _state.label = 2;
+                case 2:
                     return [
                         2
                     ];
             }
         });
     });
-    return function build() {
+    return function copyVerbatim(rawOptions) {
         return _ref.apply(this, arguments);
     };
 }();
 export var buildTypes = function() {
-    var _ref = _async_to_generator(function() {
+    var _ref = _async_to_generator(function(rawOptions) {
         var options;
-        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : getDefaultOptions();
+                    options = merge({}, getDefaultOptions(), rawOptions);
                     return [
                         4,
                         validatePackageJson({
@@ -259,18 +335,17 @@ export var buildTypes = function() {
             }
         });
     });
-    return function buildTypes() {
+    return function buildTypes(rawOptions) {
         return _ref.apply(this, arguments);
     };
 }();
 export var buildCjs = function() {
-    var _ref = _async_to_generator(function() {
+    var _ref = _async_to_generator(function(rawOptions) {
         var options, _options_cwd, cwd, _options_destination, destination, cjsPath, targetPath;
-        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : getDefaultOptions();
+                    options = merge({}, getDefaultOptions(), rawOptions);
                     cwd = (_options_cwd = options.cwd) !== null && _options_cwd !== void 0 ? _options_cwd : process.cwd();
                     destination = (_options_destination = options.destination) !== null && _options_destination !== void 0 ? _options_destination : getDefaultOptions().destination;
                     cjsPath = path.resolve(destination, "cjs");
@@ -291,6 +366,7 @@ export var buildCjs = function() {
                             "src",
                             "-C",
                             "module.type=commonjs",
+                            "--strip-leading-paths",
                             "-d",
                             cjsPath
                         ], {
@@ -318,18 +394,17 @@ export var buildCjs = function() {
             }
         });
     });
-    return function buildCjs() {
+    return function buildCjs(rawOptions) {
         return _ref.apply(this, arguments);
     };
 }();
 export var makeBaseExports = function() {
-    var _ref = _async_to_generator(function() {
+    var _ref = _async_to_generator(function(rawOptions) {
         var options, _options_cwd, cwd, exp, _tmp, baseMap;
-        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : getDefaultOptions();
+                    options = merge({}, getDefaultOptions(), rawOptions);
                     cwd = (_options_cwd = options.cwd) !== null && _options_cwd !== void 0 ? _options_cwd : process.cwd();
                     _tmp = options.exports;
                     if (_tmp) return [
@@ -375,7 +450,7 @@ export var makeBaseExports = function() {
             }
         });
     });
-    return function makeBaseExports() {
+    return function makeBaseExports(rawOptions) {
         return _ref.apply(this, arguments);
     };
 }();
@@ -605,11 +680,6 @@ var resolvePathWithExtension = function() {
                             2,
                             "".concat(targetFile, "/index.").concat(extension)
                         ];
-                    } else {
-                        return [
-                            2,
-                            "".concat(targetFile, ".").concat(extension)
-                        ];
                     }
                     return [
                         3,
@@ -618,12 +688,25 @@ var resolvePathWithExtension = function() {
                 case 2:
                     e = _state.sent();
                     return [
-                        2,
-                        "".concat(targetFile, ".").concat(extension)
+                        3,
+                        3
                     ];
                 case 3:
+                    if (targetFile.endsWith(extension)) {
+                        return [
+                            2,
+                            targetFile
+                        ];
+                    }
+                    if (targetFile.endsWith(".js")) {
+                        return [
+                            2,
+                            targetFile.replace(/\.js$/, ".".concat(extension))
+                        ];
+                    }
                     return [
-                        2
+                        2,
+                        "".concat(targetFile, ".").concat(extension)
                     ];
             }
         });
@@ -676,18 +759,18 @@ var parseExportPath = function() {
     };
 }();
 export var buildEsm = function() {
-    var _ref = _async_to_generator(function() {
+    var _ref = _async_to_generator(function(rawOptions) {
         var options, _options_destination;
-        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : getDefaultOptions();
+                    options = merge({}, getDefaultOptions(), rawOptions);
                     return [
                         4,
                         runCommand("pnpm", [
                             "swc",
                             "src",
+                            "--strip-leading-paths",
                             "-d",
                             (_options_destination = options.destination) !== null && _options_destination !== void 0 ? _options_destination : getDefaultOptions().destination
                         ], {
@@ -702,7 +785,7 @@ export var buildEsm = function() {
             }
         });
     });
-    return function buildEsm() {
+    return function buildEsm(rawOptions) {
         return _ref.apply(this, arguments);
     };
 }();

package/dist/clean.js

@@ -195,9 +195,9 @@ export var clean = function() {
                     ];
                 case 1:
                     _state.sent();
-                    doNotCleanup = rawDoNotCleanup.map(function(f) {
+                    doNotCleanup = (rawDoNotCleanup === null || rawDoNotCleanup === void 0 ? void 0 : rawDoNotCleanup.map(function(f) {
                         return "!".concat(f);
-                    });
+                    })) || [];
                     if (!all) return [
                         3,
                         3

package/dist/config.d.ts

@@ -7,13 +7,21 @@ interface ParseConfigOptions {
 }
 declare const ConfigValidation: z.ZodObject<{
     doNotCleanup: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    noCJS: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
+    copyVerbatim: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
     doNotCleanup?: string[] | undefined;
+    noCJS?: boolean | undefined;
+    copyVerbatim?: string[] | undefined;
 }, {
     doNotCleanup?: string[] | undefined;
+    noCJS?: boolean | undefined;
+    copyVerbatim?: string[] | undefined;
 }>;
 export declare const parseConfig: (options?: ParseConfigOptions) => Promise<{
     doNotCleanup?: string[] | undefined;
+    noCJS?: boolean | undefined;
+    copyVerbatim?: string[] | undefined;
 }>;
 export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAErD,UAAU,kBAAkB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,QAAA,MAAM,gBAAgB;;;;;;EAEV,CAAA;AAEZ,eAAO,MAAM,WAAW,aAAoB,kBAAkB;;EAiB7D,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAErD,UAAU,kBAAkB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,QAAA,MAAM,gBAAgB;;;;;;;;;;;;EAIV,CAAA;AAEZ,eAAO,MAAM,WAAW,aAAoB,kBAAkB;;;;EAiB7D,CAAA"}

package/dist/config.js

@@ -126,7 +126,9 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
 var ConfigValidation = z.object({
-    doNotCleanup: z.array(z.string())
+    doNotCleanup: z.array(z.string()),
+    noCJS: z.boolean().optional(),
+    copyVerbatim: z.array(z.string())
 }).partial();
 export var parseConfig = function() {
     var _ref = _async_to_generator(function(options) {