@ng-doc/builder 17.6.5 → 17.6.7

package/dev-server/index.d.ts

@@ -1,5 +1,6 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { BuilderOutputLike } from '@angular-devkit/architect/src/api';
+import { JsonObject } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { NgDocSchema } from '../interfaces';
 /**
@@ -8,5 +9,5 @@ import { NgDocSchema } from '../interfaces';
  * @param context Builder context
  */
 export declare function runDevServer(options: NgDocSchema, context: BuilderContext): Observable<BuilderOutputLike>;
-declare const _default: import("@angular-devkit/architect/src/internal").Builder<NgDocSchema & import("@angular-devkit/core").JsonObject>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<NgDocSchema & JsonObject>;
 export default _default;

package/dev-server/index.js

@@ -1,32 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runDevServer = void 0;
-const tslib_1 = require("tslib");
 const architect_1 = require("@angular-devkit/architect");
 const dev_server_1 = require("@angular-devkit/build-angular/src/builders/dev-server");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const build_ng_doc_1 = require("../engine/build-ng-doc");
 const helpers_1 = require("../helpers");
+const patch_builder_context_1 = require("./patch-builder-context");
 /**
  * Attach NgDocBuilder and run DevServer
  * @param options Builder configuration
  * @param context Builder context
  */
 function runDevServer(options, context) {
-    const browserTarget = options.buildTarget
-        ? (0, architect_1.targetFromTargetString)(options.buildTarget)
-        : null;
-    return (browserTarget ? (0, rxjs_1.from)(context.getTargetOptions(browserTarget)) : (0, rxjs_1.of)(options)).pipe((0, operators_1.switchMap)((targetOptions) => {
+    const contextWithPatch = (0, patch_builder_context_1.patchBuilderContext)(context, {
+        mock: ['@ng-doc/builder:application', './dist/libs/builder:application'],
+        with: '@angular-devkit/build-angular:application',
+        optionsTransform: (options) => {
+            delete options.ngDoc;
+        },
+    });
+    const target = options.buildTarget && (0, architect_1.targetFromTargetString)(options.buildTarget);
+    const options$ = target
+        ? (0, rxjs_1.from)(context.getTargetOptions(target))
+        : (0, rxjs_1.of)(options);
+    return options$.pipe((0, operators_1.switchMap)((targetOptions) => {
         var _a;
         const builderContext = (0, helpers_1.createBuilderContext)(targetOptions, context, (_a = options.ngDoc) === null || _a === void 0 ? void 0 : _a.config);
-        const runner = (0, build_ng_doc_1.buildNgDoc)(builderContext).pipe((0, operators_1.shareReplay)(1));
-        // This is a hack to make sure that the dev server uses the esbuild builder
-        // instead of the webpack builder. This is necessary because Angular checks
-        // the builder name to determine which builder to use for the dev server.
-        // https://github.com/angular/angular-cli/blob/9d8f6289faefa7241212f9412e70717609ef47ad/packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts#L48
-        context.getBuilderNameForTarget = () => tslib_1.__awaiter(this, void 0, void 0, function* () { return '@angular-devkit/build-angular:application'; });
-        return runner.pipe((0, operators_1.first)(), (0, operators_1.switchMap)(() => (0, rxjs_1.combineLatest)([runner, (0, dev_server_1.executeDevServer)(options, context)]).pipe((0, operators_1.map)(([, devServerOutput]) => devServerOutput))));
+        const buildNgDoc$ = (0, build_ng_doc_1.buildNgDoc)(builderContext).pipe((0, operators_1.shareReplay)(1));
+        return buildNgDoc$.pipe((0, operators_1.first)(), (0, operators_1.switchMap)(() => (0, rxjs_1.combineLatest)([buildNgDoc$, (0, dev_server_1.executeDevServer)(options, contextWithPatch)]).pipe((0, operators_1.map)(([, devServerOutput]) => devServerOutput))));
     }));
 }
 exports.runDevServer = runDevServer;

package/dev-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/dev-server/index.ts"],"names":[],"mappings":";;;;AAAA,yDAKmC;AAEnC,sFAG+D;AAC/D,+BAA2D;AAC3D,8CAAoE;AAEpE,yDAAoD;AACpD,wCAAkD;AAGlD;;;;GAIG;AACH,SAAgB,YAAY,CAC3B,OAAoB,EACpB,OAAuB;IAEvB,MAAM,aAAa,GAAkB,OAAO,CAAC,WAAW;QACvD,CAAC,CAAC,IAAA,kCAAsB,EAAC,OAAO,CAAC,WAAW,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC;IAER,OAAO,CACN,aAAa,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,SAAE,EAAC,OAAyB,CAAC,CAC7F,CAAC,IAAI,CACL,IAAA,qBAAS,EAAC,CAAC,aAAkB,EAAE,EAAE;;QAChC,MAAM,cAAc,GAAwB,IAAA,8BAAoB,EAC/D,aAAa,EACb,OAAO,EACP,MAAA,OAAO,CAAC,KAAK,0CAAE,MAAM,CACrB,CAAC;QACF,MAAM,MAAM,GAAqB,IAAA,yBAAU,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;QAEjF,2EAA2E;QAC3E,2EAA2E;QAC3E,yEAAyE;QACzE,oKAAoK;QACpK,OAAO,CAAC,uBAAuB,GAAG,GAAS,EAAE,wDAAC,OAAA,2CAA2C,CAAA,GAAA,CAAC;QAE1F,OAAO,MAAM,CAAC,IAAI,CACjB,IAAA,iBAAK,GAAE,EACP,IAAA,qBAAS,EAAC,GAAG,EAAE,CACd,IAAA,oBAAa,EAAC,CAAC,MAAM,EAAE,IAAA,6BAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAC/D,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,eAAe,CAAiC,EAAE,EAAE,CAAC,eAAe,CAAC,CAC7E,CACD,CACD,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAnCD,oCAmCC;AAED,6DAA6D;AAC7D,aAAa;AACb,kBAAe,IAAA,yBAAa,EAAC,YAAY,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/dev-server/index.ts"],"names":[],"mappings":";;;AAAA,yDAAkG;AAElG,sFAAyF;AAEzF,+BAA2D;AAC3D,8CAAoE;AAEpE,yDAAoD;AACpD,wCAAkD;AAElD,mEAA8D;AAE9D;;;;GAIG;AACH,SAAgB,YAAY,CAC3B,OAAoB,EACpB,OAAuB;IAEvB,MAAM,gBAAgB,GAAG,IAAA,2CAAmB,EAAC,OAAO,EAAE;QACrD,IAAI,EAAE,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;QACxE,IAAI,EAAE,2CAA2C;QACjD,gBAAgB,EAAE,CAAC,OAA6B,EAAE,EAAE;YACnD,OAAO,OAAO,CAAC,KAAK,CAAC;QACtB,CAAC;KACD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,IAAI,IAAA,kCAAsB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClF,MAAM,QAAQ,GAA2B,MAAM;QAC9C,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,IAAA,SAAE,EAAC,OAAgC,CAAC,CAAC;IAExC,OAAO,QAAQ,CAAC,IAAI,CACnB,IAAA,qBAAS,EAAC,CAAC,aAAa,EAAE,EAAE;;QAC3B,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,aAAa,EAAE,OAAO,EAAE,MAAA,OAAO,CAAC,KAAK,0CAAE,MAAM,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAA,yBAAU,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,WAAW,CAAC,IAAI,CACtB,IAAA,iBAAK,GAAE,EACP,IAAA,qBAAS,EAAC,GAAG,EAAE,CACd,IAAA,oBAAa,EAAC,CAAC,WAAW,EAAE,IAAA,6BAAgB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAC7E,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAC7C,CACD,CACD,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AA/BD,oCA+BC;AAED,6DAA6D;AAC7D,aAAa;AACb,kBAAe,IAAA,yBAAa,EAAC,YAAY,CAAC,CAAC"}

package/dev-server/patch-builder-context.d.ts

@@ -0,0 +1,14 @@
+import { BuilderContext } from '@angular-devkit/architect';
+/**
+ *
+ * @param context
+ * @param config
+ * @param config.mock
+ * @param config.with
+ * @param config.optionsTransform
+ */
+export declare function patchBuilderContext(context: BuilderContext, config: {
+    mock: string[];
+    with: string;
+    optionsTransform: (options: any) => void;
+}): BuilderContext;

package/dev-server/patch-builder-context.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchBuilderContext = void 0;
+const tslib_1 = require("tslib");
+// The DevServer uses EsBuild only for specific builder names.
+// https://github.com/just-jeb/angular-builders/blob/dbf4d281a29c2f93d309bba0e155c3a22965130c/packages/custom-esbuild/src/dev-server/patch-builder-context.ts#L14-L47
+/**
+ *
+ * @param context
+ * @param config
+ * @param config.mock
+ * @param config.with
+ * @param config.optionsTransform
+ */
+function patchBuilderContext(context, config) {
+    const getBuilderNameForTarget = (target) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const builderName = yield context.getBuilderNameForTarget(target);
+        if (!config.mock.includes(builderName))
+            return builderName;
+        return config.with;
+    });
+    const getTargetOptions = (target) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const builderName = yield context.getBuilderNameForTarget(target);
+        if (!config.mock.includes(builderName))
+            return context.getTargetOptions(target);
+        const options = yield context.getTargetOptions(target);
+        config.optionsTransform(options);
+        return options;
+    });
+    return Object.assign(Object.assign({}, context), { getBuilderNameForTarget, getTargetOptions });
+}
+exports.patchBuilderContext = patchBuilderContext;
+//# sourceMappingURL=patch-builder-context.js.map

package/dev-server/patch-builder-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch-builder-context.js","sourceRoot":"","sources":["../../../../libs/builder/dev-server/patch-builder-context.ts"],"names":[],"mappings":";;;;AAEA,8DAA8D;AAC9D,qKAAqK;AACrK;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAClC,OAAuB,EACvB,MAIC;IAED,MAAM,uBAAuB,GAA2C,CAAO,MAAM,EAAE,EAAE;QACxF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,WAAW,CAAC;QAC3D,OAAO,MAAM,CAAC,IAAI,CAAC;IACpB,CAAC,CAAA,CAAC;IAEF,MAAM,gBAAgB,GAAoC,CAAO,MAAM,EAAE,EAAE;QAC1E,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAChF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC;IAChB,CAAC,CAAA,CAAC;IAEF,uCAAY,OAAO,KAAE,uBAAuB,EAAE,gBAAgB,IAAG;AAClE,CAAC;AAvBD,kDAuBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-doc/builder",
-  "version": "17.6.5",
+  "version": "17.6.7",
   "type": "commonjs",
   "builders": "./builders.json",
   "schematics": "./schematics/collection.json",
@@ -11,8 +11,8 @@
     ]
   },
   "dependencies": {
-    "@ng-doc/core": "17.6.5",
-    "@ng-doc/utils": "17.6.5",
+    "@ng-doc/core": "17.6.7",
+    "@ng-doc/utils": "17.6.7",
     "@angular-devkit/architect": ">=0.1700.0",
     "@angular-devkit/build-angular": ">=17.0.0",
     "chokidar": "3.5.3",

package/templates/context.ts.nunj

@@ -17,8 +17,8 @@ export function provideNgDocContext(): Provider {
                     {%- endif %}
                     {%- if entity.order %}
                     order: {{ entity.order }},
+										{%- endif %}
                     hidden: {{ "true" if entity.target.hidden else "false" }},
-                    {%- endif %}
                     {%- if entity.isCategory %}
                     children: [
                         {%- for child in entity.navigationItems | sortNavigationEntities %}