@dcoder-x/vite 0.1.0 → 0.1.2

package/dist/ClippyVitePlugin.d.ts

@@ -1,3 +1,3 @@
 import type { Plugin } from 'vite';
-import type { ClippyPluginOptions } from '@clippy/plugin-shared';
+import type { ClippyPluginOptions } from '@dcoder-x/plugin-shared';
 export declare function clippyVitePlugin(options: ClippyPluginOptions): Plugin;

package/dist/ClippyVitePlugin.js

@@ -1,12 +1,14 @@
-import { RouteExtractor } from '@clippy/plugin-shared/extractors/RouteExtractor';
-import { ComponentExtractor } from '@clippy/plugin-shared/extractors/ComponentExtractor';
-import { SelectorGenerator } from '@clippy/plugin-shared/extractors/SelectorGenerator';
-import { FlowInferrer } from '@clippy/plugin-shared/extractors/FlowInferrer';
-import { PackageBuilder } from '@clippy/plugin-shared/upload/PackageBuilder';
-import { PackageWriter } from '@clippy/plugin-shared/upload/PackageWriter';
-import { Uploader } from '@clippy/plugin-shared/upload/Uploader';
+import { RouteExtractor } from '@dcoder-x/plugin-shared/extractors/RouteExtractor';
+import { ComponentExtractor } from '@dcoder-x/plugin-shared/extractors/ComponentExtractor';
+import { SelectorGenerator } from '@dcoder-x/plugin-shared/extractors/SelectorGenerator';
+import { FlowInferrer } from '@dcoder-x/plugin-shared/extractors/FlowInferrer';
+import { PackageBuilder } from '@dcoder-x/plugin-shared/upload/PackageBuilder';
+import { PackageWriter } from '@dcoder-x/plugin-shared/upload/PackageWriter';
+import { Uploader } from '@dcoder-x/plugin-shared/upload/Uploader';
+import { injectClippyIds, deriveBuildId, performUpload } from '@dcoder-x/plugin-shared';
 export function clippyVitePlugin(options) {
     const moduleGraph = new Map();
+    const injectedMap = new Map();
     return {
         name: 'clippy-vite-plugin',
         apply: 'build',
@@ -18,41 +20,92 @@ export function clippyVitePlugin(options) {
                 });
             }
         },
+        transform(source, id) {
+            const cleanId = id.split('?')[0];
+            if (!/\.[jt]sx?$/.test(cleanId))
+                return null;
+            const result = injectClippyIds(source, cleanId);
+            if (result.injectedCount === 0)
+                return null;
+            if (result.injected && result.injected.length)
+                injectedMap.set(cleanId, result.injected);
+            return {
+                code: result.source,
+                map: null,
+            };
+        },
         async closeBundle() {
             try {
                 const dir = process.cwd();
-                const buildId = `vite_${Date.now()}`;
+                const buildId = deriveBuildId(moduleGraph);
                 const routes = await new RouteExtractor(dir).extract();
-                const components = await new ComponentExtractor({ type: 'rollup', moduleGraph }, routes).extract();
-                const selectors = new SelectorGenerator().generate(components);
-                const flows = new FlowInferrer(routes, components).infer();
+                const extractor = new ComponentExtractor({ type: 'rollup', moduleGraph }, routes);
+                const elements = await extractor.extract();
+                const components = await extractor.extractComponents();
+                const injectedObj = Object.fromEntries(Array.from(injectedMap.entries()));
+                const selectors = new SelectorGenerator().generate(elements, injectedObj);
+                const flows = new FlowInferrer(routes, elements, components).infer();
                 const packageBuilder = new PackageBuilder();
-                const knowledgePackage = packageBuilder.buildPackage({
+                const artifacts = packageBuilder.buildArtifacts({
                     buildId,
                     bundler: 'vite',
                     routes,
-                    components,
                     selectors,
                     flows,
+                    components,
                 });
                 if (options.localOutputDir) {
-                    const written = new PackageWriter().write(options.localOutputDir, knowledgePackage);
-                    console.log(`[Clippy] Knowledge package written: ${written.jsonPath}`);
+                    try {
+                        const fs = await import('fs');
+                        const path = await import('path');
+                        fs.mkdirSync(options.localOutputDir, { recursive: true });
+                        const injectedObj = Object.fromEntries(Array.from(injectedMap.entries()));
+                        fs.writeFileSync(path.join(options.localOutputDir, 'clippy-injected.json'), JSON.stringify(injectedObj, 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(options).upload(pkg);
-                if (uploaded) {
-                    console.log('[Clippy] Knowledge package uploaded.');
+                if (options.localOutputDir) {
+                    const written = new PackageWriter().writeArtifacts(options.localOutputDir, artifacts);
+                    console.log(`[Clippy] Policy artifacts written: ${written.policyPath}, ${written.selectorsPath}`);
+                }
+                const artifactUpload = await performUpload(artifacts, 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(options);
+                if (options.legacyPackageMode) {
+                    const knowledgePackage = packageBuilder.buildPackage({
+                        buildId,
+                        bundler: 'vite',
+                        routes,
+                        components: elements,
+                        selectors,
+                        flows,
+                    });
+                    if (options.localOutputDir) {
+                        const written = new PackageWriter().write(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/vite",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -18,7 +18,7 @@
     }
   },
   "dependencies": {
-    "@dcoder-x/plugin-shared": "^0.1.0"
+    "@dcoder-x/plugin-shared": "workspace:*"
   },
   "peerDependencies": {
     "vite": ">=4.0.0",