@dcoder-x/next 0.1.0 → 0.1.2

package/dist/ClippyInjectLoader.d.ts

@@ -0,0 +1,3 @@
+import type { LoaderDefinitionFunction } from 'webpack';
+declare const loader: LoaderDefinitionFunction;
+export default loader;

package/dist/ClippyInjectLoader.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugin_shared_1 = require("@dcoder-x/plugin-shared");
+const loader = function (source) {
+    const input = typeof source === 'string' ? source : source.toString('utf-8');
+    const filePath = this.resourcePath;
+    const result = (0, plugin_shared_1.injectClippyIds)(input, filePath);
+    try {
+        // Attach metadata to the webpack module so the plugin can collect it later
+        ;
+        this._module = this._module || {};
+        this._module.__clippy_injected = result.injected || [];
+        // Some webpack versions expose buildInfo on the module
+        try {
+            ;
+            this.buildInfo = this.buildInfo || {};
+            this.buildInfo.__clippy_injected = result.injected || [];
+        }
+        catch { }
+    }
+    catch { }
+    this.callback(null, result.source);
+};
+exports.default = loader;
+module.exports = loader;

package/dist/ClippyNextPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { ClippyPluginOptions } from '@clippy/plugin-shared';
+import type { ClippyPluginOptions } from '@dcoder-x/plugin-shared';
 export declare function withClippy(nextConfig: Record<string, any> | undefined, options: ClippyPluginOptions): {
     webpack(config: any, context: any): any;
 };

package/dist/ClippyNextPlugin.js

@@ -1,12 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withClippy = withClippy;
+const path_1 = __importDefault(require("path"));
 const ClippyWebpackPlugin_1 = require("./ClippyWebpackPlugin");
 function withClippy(nextConfig = {}, options) {
     return {
         ...nextConfig,
         webpack(config, context) {
             if (!context.isServer) {
+                const loaderPath = path_1.default.join(__dirname, 'ClippyInjectLoader.js');
+                config.module.rules = config.module.rules || [];
+                config.module.rules.unshift({
+                    test: /\.[jt]sx?$/,
+                    exclude: /node_modules/,
+                    use: [{ loader: loaderPath }],
+                });
                 config.plugins.push(new ClippyWebpackPlugin_1.ClippyWebpackPlugin(options, context));
             }
             if (typeof nextConfig.webpack === 'function') {

package/dist/ClippyWebpackPlugin.d.ts

@@ -1,5 +1,5 @@
 import type { Compiler } from 'webpack';
-import type { ClippyPluginOptions } from '@clippy/plugin-shared';
+import type { ClippyPluginOptions } from '@dcoder-x/plugin-shared';
 interface NextContext {
     dir: string;
     buildId: string;

package/dist/ClippyWebpackPlugin.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClippyWebpackPlugin = void 0;
-const RouteExtractor_1 = require("@clippy/plugin-shared/extractors/RouteExtractor");
-const ComponentExtractor_1 = require("@clippy/plugin-shared/extractors/ComponentExtractor");
-const SelectorGenerator_1 = require("@clippy/plugin-shared/extractors/SelectorGenerator");
-const FlowInferrer_1 = require("@clippy/plugin-shared/extractors/FlowInferrer");
-const PackageBuilder_1 = require("@clippy/plugin-shared/upload/PackageBuilder");
-const PackageWriter_1 = require("@clippy/plugin-shared/upload/PackageWriter");
-const Uploader_1 = require("@clippy/plugin-shared/upload/Uploader");
+const RouteExtractor_1 = require("@dcoder-x/plugin-shared/extractors/RouteExtractor");
+const ComponentExtractor_1 = require("@dcoder-x/plugin-shared/extractors/ComponentExtractor");
+const SelectorGenerator_1 = require("@dcoder-x/plugin-shared/extractors/SelectorGenerator");
+const FlowInferrer_1 = require("@dcoder-x/plugin-shared/extractors/FlowInferrer");
+const PackageBuilder_1 = require("@dcoder-x/plugin-shared/upload/PackageBuilder");
+const PackageWriter_1 = require("@dcoder-x/plugin-shared/upload/PackageWriter");
+const Uploader_1 = require("@dcoder-x/plugin-shared/upload/Uploader");
+const plugin_shared_1 = require("@dcoder-x/plugin-shared");
 class ClippyWebpackPlugin {
     constructor(options, context) {
         this.options = options;
@@ -19,36 +20,86 @@ class ClippyWebpackPlugin {
                 return;
             try {
                 const routes = await new RouteExtractor_1.RouteExtractor(this.context.dir).extract();
-                const components = await new ComponentExtractor_1.ComponentExtractor({ type: 'webpack', compilation }, routes).extract();
-                const selectors = new SelectorGenerator_1.SelectorGenerator().generate(components);
-                const flows = new FlowInferrer_1.FlowInferrer(routes, components).infer();
+                const extractor = new ComponentExtractor_1.ComponentExtractor({ type: 'webpack', compilation }, routes);
+                const elements = await extractor.extract();
+                const components = await extractor.extractComponents();
+                // Collect injected metadata attached by the loader (if any)
+                const injectedMap = {};
+                try {
+                    const modules = compilation.modules || [];
+                    for (const mod of modules) {
+                        try {
+                            const resource = mod.resource || mod.userRequest || (mod.identifier && mod.identifier());
+                            if (!resource)
+                                continue;
+                            const meta = mod.__clippy_injected || mod.buildInfo?.__clippy_injected || (mod._module && mod._module.__clippy_injected);
+                            if (meta && Array.isArray(meta) && meta.length) {
+                                injectedMap[resource] = meta;
+                            }
+                        }
+                        catch { }
+                    }
+                }
+                catch { }
+                const selectors = new SelectorGenerator_1.SelectorGenerator().generate(elements, injectedMap);
+                const flows = new FlowInferrer_1.FlowInferrer(routes, elements, components).infer();
                 const packageBuilder = new PackageBuilder_1.PackageBuilder();
-                const knowledgePackage = packageBuilder.buildPackage({
+                const artifacts = packageBuilder.buildArtifacts({
                     buildId: this.context.buildId,
                     bundler: 'webpack',
                     routes,
-                    components,
                     selectors,
                     flows,
+                    components,
                 });
                 if (this.options.localOutputDir) {
-                    const written = new PackageWriter_1.PackageWriter().write(this.options.localOutputDir, knowledgePackage);
-                    console.log(`[Clippy] Knowledge package written: ${written.jsonPath}`);
+                    const written = new PackageWriter_1.PackageWriter().writeArtifacts(this.options.localOutputDir, artifacts);
+                    console.log(`[Clippy] Policy artifacts written: ${written.policyPath}, ${written.selectorsPath}`);
+                    try {
+                        const fs = require('fs');
+                        const path = require('path');
+                        fs.writeFileSync(path.join(this.options.localOutputDir, 'clippy-injected.json'), JSON.stringify(injectedMap, null, 2), 'utf-8');
+                    }
+                    catch (e) {
+                        /* ignore write errors */
+                    }
                 }
-                const pkg = packageBuilder.build({
-                    buildId: knowledgePackage.buildId,
-                    bundler: knowledgePackage.bundler,
-                    routes: knowledgePackage.routes,
-                    components: knowledgePackage.components,
-                    selectors: knowledgePackage.selectors,
-                    flows: knowledgePackage.flows,
-                });
-                const uploaded = await new Uploader_1.Uploader(this.options).upload(pkg);
-                if (uploaded) {
-                    console.log('[Clippy] Knowledge package uploaded.');
+                const artifactUpload = await (0, plugin_shared_1.performUpload)(artifacts, this.options);
+                if (artifactUpload.skipped) {
+                    console.log('[Clippy] Policy artifact upload skipped.');
                 }
                 else {
-                    console.log('[Clippy] Knowledge package upload skipped.');
+                    console.log(`[Clippy] Policy artifacts uploaded (${artifactUpload.mode}).`);
+                }
+                const uploader = new Uploader_1.Uploader(this.options);
+                if (this.options.legacyPackageMode) {
+                    const knowledgePackage = packageBuilder.buildPackage({
+                        buildId: this.context.buildId,
+                        bundler: 'webpack',
+                        routes,
+                        components: elements,
+                        selectors,
+                        flows,
+                    });
+                    if (this.options.localOutputDir) {
+                        const written = new PackageWriter_1.PackageWriter().write(this.options.localOutputDir, knowledgePackage);
+                        console.log(`[Clippy] Legacy knowledge package written: ${written.jsonPath}`);
+                    }
+                    const legacyPayload = packageBuilder.build({
+                        buildId: knowledgePackage.buildId,
+                        bundler: knowledgePackage.bundler,
+                        routes: knowledgePackage.routes,
+                        components: knowledgePackage.components,
+                        selectors: knowledgePackage.selectors,
+                        flows: knowledgePackage.flows,
+                    });
+                    const legacyUploaded = await uploader.upload(legacyPayload);
+                    if (legacyUploaded) {
+                        console.log('[Clippy] Legacy knowledge package uploaded.');
+                    }
+                    else {
+                        console.log('[Clippy] Legacy knowledge package upload skipped.');
+                    }
                 }
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcoder-x/next",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -10,7 +10,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dcoder-x/plugin-shared": "^0.1.0"
+    "@dcoder-x/plugin-shared": "workspace:*"
   },
   "peerDependencies": {
     "next": ">=13.0.0",