clickgo-native 0.0.9 → 0.0.11

package/dist/index.js

@@ -96,7 +96,7 @@ const methods = {
     'cg-set-state': {
         'once': false,
         handler: function (t, state) {
-            if (!form || !state) {
+            if (!hasFrame || !form || !state) {
                 return;
             }
             if (!verifyToken(t)) {
@@ -308,6 +308,68 @@ const methods = {
             });
         }
     },
+    'cg-form-open': {
+        'once': false,
+        handler: function (t, options = {}) {
+            var _a, _b, _c, _d, _e;
+            var _f, _g, _h;
+            if (!t || !form) {
+                return null;
+            }
+            if (!verifyToken(t)) {
+                return null;
+            }
+            (_a = options.filters) !== null && _a !== void 0 ? _a : (options.filters = []);
+            (_b = options.props) !== null && _b !== void 0 ? _b : (options.props = {});
+            (_c = (_f = options.props).file) !== null && _c !== void 0 ? _c : (_f.file = true);
+            (_d = (_g = options.props).directory) !== null && _d !== void 0 ? _d : (_g.directory = false);
+            (_e = (_h = options.props).multi) !== null && _e !== void 0 ? _e : (_h.multi = false);
+            const paths = electron.dialog.showOpenDialogSync(form, {
+                'defaultPath': options.path ? exports.tool.formatPath(options.path) : undefined,
+                'filters': options.filters.map((item) => {
+                    return {
+                        'name': item.name,
+                        'extensions': item.accept,
+                    };
+                }),
+                'properties': [
+                    options.props.file ? 'openFile' : '',
+                    options.props.directory ? 'openDirectory' : '',
+                    options.props.multi ? 'multiSelections' : '',
+                ].filter(item => item),
+            });
+            if (!paths) {
+                return null;
+            }
+            return paths.map(item => exports.tool.parsePath(item));
+        }
+    },
+    'cg-form-save': {
+        'once': false,
+        handler: function (t, options = {}) {
+            var _a;
+            if (!t || !form) {
+                return null;
+            }
+            if (!verifyToken(t)) {
+                return null;
+            }
+            (_a = options.filters) !== null && _a !== void 0 ? _a : (options.filters = []);
+            const path = electron.dialog.showSaveDialogSync(form, {
+                'defaultPath': options.path ? exports.tool.formatPath(options.path) : undefined,
+                'filters': options.filters.map((item) => {
+                    return {
+                        'name': item.name,
+                        'extensions': item.accept,
+                    };
+                }),
+            });
+            if (!path) {
+                return null;
+            }
+            return exports.tool.parsePath(path);
+        }
+    },
     'cg-ping': {
         'once': false,
         handler: function (t) {
@@ -446,23 +508,16 @@ function createForm(p) {
         }
         form.show();
     });
-    if (p.startsWith('https://') || p.startsWith('http://')) {
-        form.loadURL(p).catch(function (e) {
-            throw e;
-        });
-    }
-    else {
-        const lio = p.indexOf('?');
-        const search = lio === -1 ? '' : p.slice(lio + 1);
-        if (lio !== -1) {
-            p = p.slice(0, lio);
-        }
-        form.loadFile(p, {
-            'search': search
-        }).catch(function (e) {
-            throw e;
-        });
+    const lio = p.indexOf('?');
+    const search = lio === -1 ? '' : p.slice(lio + 1);
+    if (lio !== -1) {
+        p = p.slice(0, lio);
     }
+    form.loadFile(p, {
+        'search': search
+    }).catch(function (e) {
+        throw e;
+    });
     form.on('close', function () {
         form = undefined;
     });

package/dist/lib/fs.js

@@ -58,15 +58,6 @@ exports.copyFile = copyFile;
 const fs = __importStar(require("fs"));
 const tool = __importStar(require("./tool"));
 const platform = process.platform;
-function formatPath(path) {
-    if (platform !== 'win32') {
-        return path;
-    }
-    if (path === '/') {
-        return path;
-    }
-    return path[1] + ':' + path.slice(2);
-}
 const drives = [];
 function refreshDrives() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -87,7 +78,7 @@ function refreshDrives() {
 }
 function getContent(path, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         const encoding = options.encoding;
         const start = options.start;
         const end = options.end;
@@ -136,7 +127,7 @@ function getContent(path, options) {
 }
 function putContent(path, data, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         try {
             yield fs.promises.writeFile(path, data, options);
             return true;
@@ -148,7 +139,7 @@ function putContent(path, data, options) {
 }
 function readLink(path, encoding) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         try {
             return yield fs.promises.readlink(path, {
                 'encoding': encoding
@@ -161,8 +152,8 @@ function readLink(path, encoding) {
 }
 function symlink(filePath, linkPath, type) {
     return __awaiter(this, void 0, void 0, function* () {
-        filePath = formatPath(filePath);
-        linkPath = formatPath(linkPath);
+        filePath = tool.formatPath(filePath);
+        linkPath = tool.formatPath(linkPath);
         try {
             yield fs.promises.symlink(filePath, linkPath, type);
             return true;
@@ -174,7 +165,7 @@ function symlink(filePath, linkPath, type) {
 }
 function unlink(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         for (let i = 0; i <= 2; ++i) {
             try {
                 yield fs.promises.unlink(path);
@@ -195,7 +186,7 @@ function unlink(path) {
 }
 function stats(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         try {
             const item = yield fs.promises.lstat(path);
             return {
@@ -221,7 +212,7 @@ function stats(path) {
 }
 function mkdir(path, mode) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         const stats = yield fs.promises.lstat(path);
         if (stats.isDirectory()) {
             return true;
@@ -240,7 +231,7 @@ function mkdir(path, mode) {
 }
 function rmdir(path) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         const stats = yield fs.promises.lstat(path);
         if (!stats.isDirectory()) {
             return true;
@@ -256,7 +247,7 @@ function rmdir(path) {
 }
 function chmod(path, mod) {
     return __awaiter(this, void 0, void 0, function* () {
-        path = formatPath(path);
+        path = tool.formatPath(path);
         try {
             yield fs.promises.chmod(path, mod);
             return true;
@@ -268,8 +259,8 @@ function chmod(path, mod) {
 }
 function rename(oldPath, newPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        oldPath = formatPath(oldPath);
-        newPath = formatPath(newPath);
+        oldPath = tool.formatPath(oldPath);
+        newPath = tool.formatPath(newPath);
         try {
             yield fs.promises.rename(oldPath, newPath);
             return true;
@@ -323,8 +314,8 @@ function readDir(path, encoding) {
 }
 function copyFile(src, dest) {
     return __awaiter(this, void 0, void 0, function* () {
-        src = formatPath(src);
-        dest = formatPath(dest);
+        src = tool.formatPath(src);
+        dest = tool.formatPath(dest);
         try {
             yield fs.promises.copyFile(src, dest);
             return true;

package/dist/lib/tool.d.ts

@@ -1 +1,3 @@
 export declare function sleep(ms: number): Promise<void>;
+export declare function formatPath(path: string): string;
+export declare function parsePath(path: string): string;

package/dist/lib/tool.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sleep = sleep;
+exports.formatPath = formatPath;
+exports.parsePath = parsePath;
+const platform = process.platform;
 function sleep(ms) {
     return new Promise(function (resolve) {
         setTimeout(function () {
@@ -8,3 +11,23 @@ function sleep(ms) {
         }, ms);
     });
 }
+function formatPath(path) {
+    if (platform !== 'win32') {
+        return path;
+    }
+    if (path === '/') {
+        return path;
+    }
+    path = path.replace(/\//g, '\\');
+    return path[1] + ':' + path.slice(2);
+}
+function parsePath(path) {
+    if (platform !== 'win32') {
+        return path;
+    }
+    path = path.replace(/\\/g, '/');
+    if (path === '/') {
+        return path;
+    }
+    return '/' + path[0].toLowerCase() + path.slice(2);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo-native",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "The software developed with ClickGo will run in Windows, Mac OS, Linux.",
   "keywords": [
     "clickgo",
@@ -9,17 +9,17 @@
   "main": "dist/index.js",
   "author": "hanguoshuai",
   "license": "Apache-2.0",
-  "types": "./dist/index.ts",
+  "types": "./dist/index.d.ts",
   "scripts": {
     "native": "electron ./dist/test"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
-    "@types/node": "^24.0.13",
+    "@types/node": "^24.0.14",
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "clickgo": "^3.16.17",
+    "clickgo": "^3.16.18",
     "electron": "^37.2.1"
   }
 }

package/types/loader.d.ts

@@ -1,10 +0,0 @@
-import * as litertLoader from '@litert/loader';
-
-declare global {
-    type ILoader = litertLoader.ILoader;
-    type ILoaderUrl = litertLoader.ILoaderUrl;
-
-    const loader: typeof litertLoader.loader;
-    const __invoke: typeof litertLoader.__invoke;
-    const __preprocess: typeof litertLoader.__preprocess;
-}