@navita/core 0.0.8 → 0.0.9

package/createRenderer.d.ts

@@ -1,3 +1,4 @@
+import * as magic_string from 'magic-string';
 import { Options as Options$1, Engine, UsedIdCache } from '@navita/engine';
 export { Engine, Options as EngineOptions, UsedIdCache } from '@navita/engine';
 import { ImportMap } from '@navita/types';
@@ -8,8 +9,9 @@ interface Options {
     readFile: (filepath: string) => Promise<string>;
     importMap: ImportMap;
     engineOptions?: Options$1;
+    context?: string;
 }
-declare function createRenderer({ resolver, readFile, importMap, engineOptions, }: Options): {
+declare function createRenderer({ resolver, readFile, importMap, engineOptions, context, }: Options): {
     engine: Engine;
     transformAndProcess({ content, filePath, }: {
         content: string;
@@ -18,6 +20,7 @@ declare function createRenderer({ resolver, readFile, importMap, engineOptions,
         result: string;
         dependencies: string[];
         usedIds: UsedIdCache;
+        sourceMap: magic_string.SourceMap;
     }>;
 };
 type Renderer = ReturnType<typeof createRenderer>;

package/createRenderer.js

@@ -1,52 +1,45 @@
 'use strict';
 
 var engine = require('@navita/engine');
-var swc = require('@navita/swc');
+var MagicString = require('magic-string');
 var evaluateAndProcess = require('./evaluateAndProcess.js');
 require('node:path');
+require('@navita/swc');
 require('node:vm');
 require('node:fs');
 require('enhanced-resolve');
 require('@navita/adapter');
 
-function startsWithRSCDirective(content) {
-    return /^(['"])use client\1;?/.test(content);
-}
-
-function createRenderer({ resolver , readFile , importMap =[] , engineOptions  }) {
-    const engine$1 = new engine.Engine(engineOptions);
+function createRenderer({ resolver , readFile , importMap =[] , engineOptions , context  }) {
+    const engine$1 = new engine.Engine({
+        context,
+        ...engineOptions || {}
+    });
     return {
         engine: engine$1,
         async transformAndProcess ({ content , filePath  }) {
-            const [newContent, { result , dependencies  }] = await Promise.all([
-                swc.transformer(content, {
-                    filename: filePath,
-                    importMap
-                }),
-                evaluateAndProcess.evaluateAndProcess({
-                    type: 'entryPoint',
-                    source: content,
-                    filePath,
-                    resolver,
-                    readFile,
-                    importMap,
-                    engine: engine$1
-                })
-            ]);
-            const finalContent = [];
-            // Check if content starts with "use client".
-            if (startsWithRSCDirective(content)) {
-                const [directive, ...restContent] = newContent.trim().split('\n');
-                finalContent.push(directive, result, ...restContent);
-            } else {
-                finalContent.push(result, newContent.trim());
+            const { result , dependencies  } = await evaluateAndProcess.evaluateAndProcess({
+                type: 'entryPoint',
+                source: content,
+                filePath,
+                resolver,
+                readFile,
+                importMap,
+                engine: engine$1
+            });
+            const newSource = new MagicString(content, {
+                filename: filePath
+            });
+            for (const { start , end , value  } of result.reverse()){
+                newSource.update(start, end, value);
             }
             return {
-                result: finalContent.join('\n'),
+                result: newSource.toString(),
                 dependencies,
                 usedIds: engine$1.getUsedCacheIds([
                     filePath
-                ])
+                ]),
+                sourceMap: newSource.generateMap()
             };
         }
     };

package/createRenderer.mjs

@@ -1,50 +1,43 @@
 import { Engine } from '@navita/engine';
-import { transformer } from '@navita/swc';
+import MagicString from 'magic-string';
 import { evaluateAndProcess } from './evaluateAndProcess.mjs';
 import 'node:path';
+import '@navita/swc';
 import 'node:vm';
 import 'node:fs';
 import 'enhanced-resolve';
 import '@navita/adapter';
 
-function startsWithRSCDirective(content) {
-    return /^(['"])use client\1;?/.test(content);
-}
-
-function createRenderer({ resolver , readFile , importMap =[] , engineOptions  }) {
-    const engine = new Engine(engineOptions);
+function createRenderer({ resolver , readFile , importMap =[] , engineOptions , context  }) {
+    const engine = new Engine({
+        context,
+        ...engineOptions || {}
+    });
     return {
         engine,
         async transformAndProcess ({ content , filePath  }) {
-            const [newContent, { result , dependencies  }] = await Promise.all([
-                transformer(content, {
-                    filename: filePath,
-                    importMap
-                }),
-                evaluateAndProcess({
-                    type: 'entryPoint',
-                    source: content,
-                    filePath,
-                    resolver,
-                    readFile,
-                    importMap,
-                    engine
-                })
-            ]);
-            const finalContent = [];
-            // Check if content starts with "use client".
-            if (startsWithRSCDirective(content)) {
-                const [directive, ...restContent] = newContent.trim().split('\n');
-                finalContent.push(directive, result, ...restContent);
-            } else {
-                finalContent.push(result, newContent.trim());
+            const { result , dependencies  } = await evaluateAndProcess({
+                type: 'entryPoint',
+                source: content,
+                filePath,
+                resolver,
+                readFile,
+                importMap,
+                engine
+            });
+            const newSource = new MagicString(content, {
+                filename: filePath
+            });
+            for (const { start , end , value  } of result.reverse()){
+                newSource.update(start, end, value);
             }
             return {
-                result: finalContent.join('\n'),
+                result: newSource.toString(),
                 dependencies,
                 usedIds: engine.getUsedCacheIds([
                     filePath
-                ])
+                ]),
+                sourceMap: newSource.generateMap()
             };
         }
     };

package/evaluateAndProcess.d.ts

@@ -1,9 +1,16 @@
 import { Engine } from '@navita/engine';
 import { ImportMap } from '@navita/types';
 
+type FilePath$1 = string;
+type ResolverCache = Record<FilePath$1, unknown>;
+type NodeModuleCache = Record<FilePath$1, unknown>;
+
 type FilePath = string;
-type ResolverCache = Record<FilePath, unknown>;
-type NodeModuleCache = Record<FilePath, unknown>;
+type CollectedResults = Record<FilePath, {
+    start: number;
+    end: number;
+    value: string;
+}[]>;
 
 type FilePathWithType = string;
 type ModuleCache = Map<FilePathWithType, {
@@ -20,7 +27,7 @@ interface Caches {
 }
 type Types = 'entryPoint' | 'dependency';
 interface Output<Type extends Types> {
-    result: Type extends 'entryPoint' ? string : Record<string, unknown>;
+    result: Type extends 'entryPoint' ? CollectedResults[number] : Record<string, unknown>;
     dependencies: string[];
 }
 declare function evaluateAndProcess<Type extends 'entryPoint' | 'dependency'>({ type, filePath, source, engine, resolver, readFile, importMap, nodeModuleCache, resolverCache, moduleCache, }: {

package/evaluateAndProcess.js

@@ -5,8 +5,8 @@ var swc = require('@navita/swc');
 var vm = require('node:vm');
 var fs = require('node:fs');
 var enhancedResolve = require('enhanced-resolve');
-var engine = require('@navita/engine');
 var adapter = require('@navita/adapter');
+var engine = require('@navita/engine');
 
 function createMagicProxy() {
     // Todo: at some point, the magic proxy should notify the user
@@ -146,16 +146,6 @@ function createDefineFunction({ filePath , resolver , isExternal , resolverCache
     };
 }
 
-function formatResults(results = []) {
-    const result = results.map((item)=>{
-        if (item instanceof engine.Static) {
-            return '';
-        }
-        return JSON.stringify(item);
-    });
-    return `const $$evaluatedValues = [${result.join(',')}];`;
-}
-
 function setAdapter({ engine: engine$1 , collectResults ,  }) {
     adapter.setAdapter({
         generateIdentifier: (value)=>engine$1.generateIdentifier(value),
@@ -171,7 +161,7 @@ function setAdapter({ engine: engine$1 , collectResults ,  }) {
             }
             return engine$1.addFontFace(fontFace);
         },
-        collectResult ({ index , filePath , identifier , result: resultFactory , line , column ,  }) {
+        collectResult ({ index , filePath , identifier , result: resultFactory , sourceMap: { line , column  } , position ,  }) {
             if (index === 0) {
                 if (collectResults) {
                     collectResults[filePath] = [];
@@ -198,7 +188,12 @@ function setAdapter({ engine: engine$1 , collectResults ,  }) {
                 }
             }
             if (collectResults) {
-                collectResults[filePath][index] = result;
+                const [start, end] = position;
+                collectResults[filePath][index] = {
+                    start,
+                    end,
+                    value: result === undefined ? "undefined" : JSON.stringify(result)
+                };
             }
             return result;
         }
@@ -257,7 +252,7 @@ async function evaluateAndProcess({ type , filePath , source , engine , resolver
     return compiledFn().then(({ dependencies , exports  })=>{
         if (type === 'entryPoint') {
             return {
-                result: formatResults(collectedResults[filePath]),
+                result: collectedResults[filePath],
                 dependencies
             };
         }

package/evaluateAndProcess.mjs

@@ -7,8 +7,8 @@ import { extraction } from '@navita/swc';
 import vm from 'node:vm';
 import fs from 'node:fs';
 import enhancedResolve from 'enhanced-resolve';
-import { Static, ClassList } from '@navita/engine';
 import { setAdapter as setAdapter$1 } from '@navita/adapter';
+import { ClassList } from '@navita/engine';
 
 function createMagicProxy() {
     // Todo: at some point, the magic proxy should notify the user
@@ -148,16 +148,6 @@ function createDefineFunction({ filePath , resolver , isExternal , resolverCache
     };
 }
 
-function formatResults(results = []) {
-    const result = results.map((item)=>{
-        if (item instanceof Static) {
-            return '';
-        }
-        return JSON.stringify(item);
-    });
-    return `const $$evaluatedValues = [${result.join(',')}];`;
-}
-
 function setAdapter({ engine , collectResults ,  }) {
     setAdapter$1({
         generateIdentifier: (value)=>engine.generateIdentifier(value),
@@ -173,7 +163,7 @@ function setAdapter({ engine , collectResults ,  }) {
             }
             return engine.addFontFace(fontFace);
         },
-        collectResult ({ index , filePath , identifier , result: resultFactory , line , column ,  }) {
+        collectResult ({ index , filePath , identifier , result: resultFactory , sourceMap: { line , column  } , position ,  }) {
             if (index === 0) {
                 if (collectResults) {
                     collectResults[filePath] = [];
@@ -200,7 +190,12 @@ function setAdapter({ engine , collectResults ,  }) {
                 }
             }
             if (collectResults) {
-                collectResults[filePath][index] = result;
+                const [start, end] = position;
+                collectResults[filePath][index] = {
+                    start,
+                    end,
+                    value: result === undefined ? "undefined" : JSON.stringify(result)
+                };
             }
             return result;
         }
@@ -259,7 +254,7 @@ async function evaluateAndProcess({ type , filePath , source , engine , resolver
     return compiledFn().then(({ dependencies , exports  })=>{
         if (type === 'entryPoint') {
             return {
-                result: formatResults(collectedResults[filePath]),
+                result: collectedResults[filePath],
                 dependencies
             };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navita/core",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Core package for Navita. Used for creating integrations.",
   "keywords": [
     "core",
@@ -32,10 +32,11 @@
   "dependencies": {
     "enhanced-resolve": "^5.15.0",
     "outdent": "^0.8.0",
+    "magic-string": "^0.30.3",
     "@navita/types": "0.0.8",
-    "@navita/adapter": "0.0.8",
-    "@navita/swc": "0.0.8",
-    "@navita/engine": "0.0.8"
+    "@navita/adapter": "0.0.9",
+    "@navita/swc": "0.0.9",
+    "@navita/engine": "0.0.9"
   },
   "license": "MIT",
   "author": "Eagerpatch",