wovn-nextjs 0.0.21 → 0.0.23

package/bin/wovn-nextjs

@@ -31,19 +31,27 @@ async function main() {
     if (command === 'build' && context.projectToken && context.hostname) {
         context.wovnJsData = await httpsRequest(`https://data.wovn.io/js_data/json/1/${context.projectToken}/?u=http%3A%2F%2F${context.hostname}`).then(body => JSON.parse(body.toString()))
         await overwriteTsxAndJsxFiles(context, undo) // Make sure to collect translatable texts
-        await overwriteTsxAndJsxFiles(context, transform).then(() => reportToWovn(context))
+        await overwriteTsxAndJsxFiles(context, transform)
+        await reportToWovn(context)
         await overwriteInitializationProcess(context)
         await createMiddlewareFile(context)
         if (process.env.WOVN_DEBUG) {
             console.dir(context, {depth: null})
         }
-    } else if (command === 'build-config' && context.projectToken && context.hostname) {
+    } else if (command === 'enable' && context.projectToken && context.hostname) {
         context.wovnJsData = await httpsRequest(`https://data.wovn.io/js_data/json/1/${context.projectToken}/?u=http%3A%2F%2F${context.hostname}`).then(body => JSON.parse(body.toString()))
+        await walkTsxAndJsx(context, transform)
         await overwriteInitializationProcess(context)
         await createMiddlewareFile(context)
         if (process.env.WOVN_DEBUG) {
             console.dir(context, {depth: null})
         }
+    } else if (command === 'report' && context.projectToken && context.hostname) {
+        await walkTsxAndJsx(context, transform)
+        await reportToWovn(context)
+        if (process.env.WOVN_DEBUG) {
+            console.dir(context, {depth: null})
+        }
     } else if (command === 'undo') {
         await overwriteTsxAndJsxFiles(context, undo)
         await undoIndexJavaScriptFiles()
@@ -212,6 +220,10 @@ function transform(context, source) {
         code = code.replaceAll(/^(import { *useRouter *} from ["'`]next\/navigation.*)/mg, 'import { useAppRouter as useRouter } from "wovn-nextjs" //$1 wovn-nextjs-command-comment')
         code = code.match(/^['"]use /) ? code.replace(/\n/, '\n' + importer) : importer + code
     }
+    for (const text of getTextsFromTokens(tokens)) {
+        context.uvs.set(text, -1)
+        component.uvs.add(text)
+    }
     context.components.push(component)
     return code
 }
@@ -225,6 +237,14 @@ function undo(context, code) {
     return code
 }
 
+function getTextsFromTokens(tokens) {
+    function unquote(s) {
+        return s[0] === '"' ? s.slice(1, -1).replace(/\\"/g, '"') :
+            s[0] === "'" ? s.slice(1, -1).replace(/\\'/g, "'") : '';
+    }
+    return tokens.filter((t, i) => i >=2 && t.type === 'String' && (t.value[0] === '"' || t.value[0] === "'") && tokens[i-1].value === '(' && tokens[i-2].value === 't').map(t => unquote(t.value)).filter(s => s.length)
+}
+
 const appendMarker = '\n// wovn-nextjs-command-appended'
 
 async function overwriteInitializationProcess(context) {
@@ -261,6 +281,17 @@ async function overwriteJavaScriptFiles(filename, convert) {
 }
 
 async function overwriteTsxAndJsxFiles(context, convert) {
+    const promises = []
+    await walkTsxAndJsx(async (context, source) => {
+        const convertedSource = convert(context, source)
+        if (source !== convertedSource) {
+            promises.push(fsp.writeFile(context.pathname, convertedSource))
+        }
+    })
+    return Promise.all(promises)
+}
+
+async function walkTsxAndJsx(context, callback){
     async function* targetFiles(dir) {
         const dirents = await fsp.readdir(dir, { withFileTypes: true });
         for (const dirent of dirents) {
@@ -274,17 +305,12 @@ async function overwriteTsxAndJsxFiles(context, convert) {
             }
         }
     }
-    const promises = []
     const pwd = process.env.PWD
     for await (const pathname of targetFiles(buildDir)) {
         context.pathname = pathname.slice(pwd.length + buildDir.length)
         const source = await fsp.readFile(pathname, 'utf-8')
-        const convertedSource = convert(context, source)
-        if (source !== convertedSource) {
-            promises.push(fsp.writeFile(pathname, convertedSource))
-        }
+        callback(context, source)
     }
-    return Promise.all(promises)
 }
 
 async function reportToWovn(context) {
@@ -307,6 +333,9 @@ async function reportToWovn(context) {
 function httpsRequest(url, method='get', body='') {
     return new Promise((resolve, reject) => {
         try {
+            if (process.env.WOVN_DEBUG) {
+                console.dir({method, url, body}, {depth: null})
+            }
             const req = https.request(url, { method }, res => {
                 if (res.statusCode >= 200 && res.statusCode < 300) {
                     const chunks = []

package/dist/cjs/index.js

@@ -97,10 +97,7 @@ function usePageRouter() {
                 case 'replace':
                     return (url, as, options) => target.replace(link(url), as ? link(as) : as, options);
                 case 'prefetch':
-                    return (url, asPath, options) => {
-                        console.log(url, asPath, target);
-                        return target.prefetch(link(url), asPath ? link(asPath) : asPath, options);
-                    };
+                    return (url, asPath, options) => target.prefetch(link(url), asPath ? link(asPath) : asPath, options);
                 default:
                     return Reflect.get(target, prop, receiver);
             }

package/dist/esm/index.js

@@ -86,10 +86,7 @@ export function usePageRouter() {
                 case 'replace':
                     return (url, as, options) => target.replace(link(url), as ? link(as) : as, options);
                 case 'prefetch':
-                    return (url, asPath, options) => {
-                        console.log(url, asPath, target);
-                        return target.prefetch(link(url), asPath ? link(asPath) : asPath, options);
-                    };
+                    return (url, asPath, options) => target.prefetch(link(url), asPath ? link(asPath) : asPath, options);
                 default:
                     return Reflect.get(target, prop, receiver);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wovn-nextjs",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Localize the Next.js web application without changing the code",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",