@driveflux/fab 2.2.2 → 2.3.1

package/bin/fab.js

@@ -17,6 +17,7 @@ function makeCleanCommand() {
     .option('-c, --cwd <cwd>', 'The current working directory', process.cwd())
     .option('-d, --dest <destination>', 'The destination path for the package, example: dist', 'dist')
     .option('--clean-ts', 'Clean typescript files')
+    .option('--dry', 'Dry run')
     .option('-a, --all', 'Removes everything built by fab')
     .action(async (options) => {
       const cwd = path.resolve(process.cwd(), options.cwd)
@@ -34,7 +35,7 @@ function makeBuildCommand() {
   return new Command('build')
     .description('Build the package')
     .option('-c, --cwd <cwd>', 'The current working directory', process.cwd())
-    .option('-d, --dest <destination>', 'The destination path for the package, example: dist', 'dist')
+    .option('-d, --dest <destination>', 'The destination path for the package, example: dist')
     .option('-s, --src <source>', 'The source path for the package, example: dist', 'src')
     .option('-r, --reset', 'Clean up everything and build again')
     .addOption(
@@ -43,7 +44,7 @@ function makeBuildCommand() {
         .default('all')
     )
     .action(async (options) => {
-      const { target } = options
+      const { target, dest: destination, src, ...rest } = options
       const cwd = path.resolve(process.cwd(), options.cwd)
 
       const config = await parseConfig({ cwd })
@@ -53,9 +54,11 @@ function makeBuildCommand() {
       }
 
       const finalOptions = {
-        ...options,
+        ...rest,
         cwd,
-        ...config
+        ...config,
+        source: src || config.source,
+        destination: destination || config.destination,
       }
 
       switch (target) {

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,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EACX,WAAW,EACX,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,MAAM,YAAY,CAAA;AAGnB,eAAO,MAAM,KAAK,gBACJ,UAAU,GAAG,YAAY,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,kBAiBxD,CAAA;AAED,eAAO,MAAM,YAAY,gBAAuB,mBAAmB,kBAmClE,CAAA;AAED,eAAO,MAAM,UAAU,gBAAuB,WAAW,kBAWxD,CAAA;AAED,eAAO,MAAM,QAAQ,gBAAuB,eAAe,kBA4B1D,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,EACX,WAAW,EACX,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,MAAM,YAAY,CAAA;AAGnB,eAAO,MAAM,KAAK,gBACJ,UAAU,GAAG,YAAY,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,kBAiBxD,CAAA;AAED,eAAO,MAAM,YAAY,gBAAuB,mBAAmB,kBAmClE,CAAA;AAED,eAAO,MAAM,UAAU,gBAAuB,WAAW,kBAaxD,CAAA;AAED,eAAO,MAAM,QAAQ,gBAAuB,eAAe,kBA4B1D,CAAA"}

package/dist/build.js

@@ -182,6 +182,7 @@ function _ts_generator(thisArg, body) {
 }
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { performance } from 'node:perf_hooks';
 import merge from 'lodash.merge';
 import { clean } from './clean.js';
 import { ensureDir, getDefaultOptions, runBin, runCommand } from './utils.js';
@@ -294,12 +295,13 @@ export var copyVerbatim = /*#__PURE__*/ function() {
 }();
 export var buildTypes = /*#__PURE__*/ function() {
     var _ref = _async_to_generator(function(rawOptions) {
-        var options, tsProject;
+        var options, tsProject, now;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     options = merge({}, getDefaultOptions(), rawOptions);
                     tsProject = path.resolve(options.cwd, 'tsconfig.json');
+                    now = performance.now();
                     return [
                         4,
                         runCommand('pnpm', [
@@ -312,6 +314,7 @@ export var buildTypes = /*#__PURE__*/ function() {
                     ];
                 case 1:
                     _state.sent();
+                    console.log("Types built in ".concat((performance.now() - now).toFixed(2), "ms"));
                     return [
                         2
                     ];

package/dist/clean.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,eAAO,MAAM,KAAK,eAAsB,YAAY,kBAgBnD,CAAA"}
+{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,eAAO,MAAM,KAAK,eAAsB,YAAY,kBAyBnD,CAAA"}

package/dist/clean.js

@@ -1,3 +1,11 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -27,6 +35,23 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
 function _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -128,26 +153,34 @@ import merge from 'lodash.merge';
 import { getDefaultOptions } from './utils.js';
 export var clean = /*#__PURE__*/ function() {
     var _ref = _async_to_generator(function(rawOptions) {
-        var _merge, destination, all, commandOptions;
+        var _merge, destination, cleanTs, all, cleanJsGlobs, cleanTsGlobs, cwd, dry, globs, _globs, result;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    _merge = merge({}, getDefaultOptions(), rawOptions), destination = _merge.destination, all = _merge.cleanTs;
-                    commandOptions = [
+                    _merge = merge({}, getDefaultOptions(), rawOptions), destination = _merge.destination, cleanTs = _merge.cleanTs, all = _merge.all, cleanJsGlobs = _merge.cleanJsGlobs, cleanTsGlobs = _merge.cleanTsGlobs, cwd = _merge.cwd, dry = _merge.dry;
+                    globs = cleanJsGlobs ? cleanJsGlobs : [
                         path.resolve(destination, '**/*.js')
                     ];
-                    if (all) {
-                        commandOptions.push(path.resolve(destination, '**/*.d.ts'));
-                        commandOptions.push(path.resolve(destination, 'tsconfig.tsbuildinfo'));
+                    if (cleanTs || all) {
+                        if (cleanTsGlobs) {
+                            ;
+                            (_globs = globs).push.apply(_globs, _to_consumable_array(cleanTsGlobs));
+                        } else {
+                            globs.push(path.resolve(destination, '**/*.d.ts'));
+                        }
                     }
+                    globs.push(path.resolve(cwd || '.', 'tsconfig.tsbuildinfo'));
                     return [
                         4,
-                        Promise.all(commandOptions.map(function() {
-                            return deleteAsync(path.resolve(destination, '**/*.js'));
-                        }))
+                        deleteAsync(globs, {
+                            dryRun: dry
+                        })
                     ];
                 case 1:
-                    _state.sent();
+                    result = _state.sent();
+                    if (dry) {
+                        console.log('Files and directories that would be deleted:\n', result.join('\n'));
+                    }
                     return [
                         2
                     ];

package/dist/config.d.ts

@@ -15,16 +15,22 @@ declare const ConfigValidation: z.ZodObject<{
      * or an array of 2 paths [source, destination].
      */
     copyVerbatim: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, "many">;
+    cleanJsGlobs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    cleanTsGlobs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
     source: string;
     destination: string;
     noTypes: boolean;
     copyVerbatim: (string | string[])[];
+    cleanJsGlobs?: string[] | undefined;
+    cleanTsGlobs?: string[] | undefined;
 }, {
     source: string;
     destination: string;
     noTypes: boolean;
     copyVerbatim: (string | string[])[];
+    cleanJsGlobs?: string[] | undefined;
+    cleanTsGlobs?: string[] | undefined;
 }>;
 export declare const parseConfig: (options?: ParseConfigOptions) => Promise<FullConfig>;
 export {};

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AACxC,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAEzD,UAAU,kBAAkB;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,QAAA,MAAM,gBAAgB;;;;IAIrB;;;OAGG;;;;;;;;;;;;EAEF,CAAA;AAEF,eAAO,MAAM,WAAW,aACb,kBAAkB,KAC1B,OAAO,CAAC,UAAU,CAmBpB,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AACxC,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAEzD,UAAU,kBAAkB;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,QAAA,MAAM,gBAAgB;;;;IAIrB;;;OAGG;;;;;;;;;;;;;;;;;;EAIF,CAAA;AAEF,eAAO,MAAM,WAAW,aACb,kBAAkB,KAC1B,OAAO,CAAC,UAAU,CAmBpB,CAAA"}

package/dist/config.js

@@ -134,7 +134,9 @@ var ConfigValidation = z.object({
     /**
 	 * The files to copy verbatim. It can be a single source path, it is moved as it is to the destination folder
 	 * or an array of 2 paths [source, destination].
-	 */ copyVerbatim: z.array(z.string().or(z.array(z.string()).length(2)))
+	 */ copyVerbatim: z.array(z.string().or(z.array(z.string()).length(2))),
+    cleanJsGlobs: z.array(z.string()).optional(),
+    cleanTsGlobs: z.array(z.string()).optional()
 });
 export var parseConfig = /*#__PURE__*/ function() {
     var _ref = _async_to_generator(function(options) {

package/dist/types.d.ts

@@ -11,5 +11,10 @@ export interface CopyVerbatimOptions extends BaseOptions {
 }
 export interface CleanOptions extends Pick<BaseOptions, 'destination'> {
     cleanTs?: boolean;
+    cwd?: string;
+    all?: boolean;
+    cleanJsGlobs?: Config['cleanJsGlobs'];
+    cleanTsGlobs?: Config['cleanTsGlobs'];
+    dry?: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,WAAW,WAAW;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,eAAgB,SAAQ,WAAW;CAAG;AAEvD,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC;IACrE,OAAO,CAAC,EAAE,OAAO,CAAA;CACjB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,WAAW,WAAW;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,eAAgB,SAAQ,WAAW;CAAG;AAEvD,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC;IACrE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IACrC,GAAG,CAAC,EAAE,OAAO,CAAA;CACb"}

package/dist/utils.d.ts

@@ -1,8 +1,12 @@
 import { type SpawnOptions } from 'node:child_process';
-import type { FullConfig } from './config.js';
 export declare const ensureDir: (dir: string) => Promise<void>;
 export declare const runBin: (bin: string, args: string[], options?: SpawnOptions) => Promise<unknown>;
 export declare const runCommand: (cmd: string, args: string[], options?: SpawnOptions) => Promise<unknown>;
 export declare const getBaseDir: () => string;
-export declare const getDefaultOptions: () => FullConfig;
+export declare const getDefaultOptions: () => {
+    source: string;
+    destination: string;
+    noTypes: boolean;
+    copyVerbatim: never[];
+};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAA;AAG7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,eAAO,MAAM,SAAS,QAAe,MAAM,kBAS1C,CAAA;AAED,eAAO,MAAM,MAAM,QACb,MAAM,QACL,MAAM,EAAE,YACJ,YAAY,qBAmBtB,CAAA;AAED,eAAO,MAAM,UAAU,QACjB,MAAM,QACL,MAAM,EAAE,YACJ,YAAY,qBAiBtB,CAAA;AAED,eAAO,MAAM,UAAU,cAMtB,CAAA;AAED,eAAO,MAAM,iBAAiB,QAAO,UAKnC,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAA;AAI7D,eAAO,MAAM,SAAS,QAAe,MAAM,kBAS1C,CAAA;AAED,eAAO,MAAM,MAAM,QACb,MAAM,QACL,MAAM,EAAE,YACJ,YAAY,qBAmBtB,CAAA;AAED,eAAO,MAAM,UAAU,QACjB,MAAM,QACL,MAAM,EAAE,YACJ,YAAY,qBAiBtB,CAAA;AAED,eAAO,MAAM,UAAU,cAMtB,CAAA;AAED,eAAO,MAAM,iBAAiB;;;;;CAK5B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@driveflux/fab",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "type": "module",
   "exports": {
     ".": {
@@ -16,16 +16,16 @@
   ],
   "dependencies": {
     "@swc/cli": "0.4.1-nightly.20240914",
-    "@swc/core": "1.7.36",
+    "@swc/core": "1.7.39",
     "commander": "^12.1.0",
     "del": "^8.0.0",
     "lodash.merge": "^4.6.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@driveflux/tsconfig": "1.2.2",
+    "@driveflux/tsconfig": "1.3.0",
     "@types/lodash.merge": "^4.6.9",
-    "@types/node": "^22.7.7",
+    "@types/node": "^22.7.8",
     "del-cli": "^6.0.0",
     "type-fest": "^4.26.1",
     "typescript": "^5.6.3"