clickgo 3.0.0-dev → 3.0.1-dev2

package/README.md

@@ -5,41 +5,33 @@
 [![npm version](https://img.shields.io/npm/v/clickgo.svg?colorB=brightgreen)](https://www.npmjs.com/package/clickgo "Stable Version")
 [![npm version](https://img.shields.io/npm/v/clickgo/dev.svg)](https://www.npmjs.com/package/clickgo "Development Version")
 [![npm version](https://img.shields.io/npm/v/clickgo/beta.svg)](https://www.npmjs.com/package/clickgo "Beta Version")
-[![License](https://img.shields.io/github/license/MaiyunNET/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/blob/master/LICENSE)
-[![GitHub issues](https://img.shields.io/github/issues/MaiyunNET/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/issues)
-[![GitHub Releases](https://img.shields.io/github/release/MaiyunNET/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/releases "Stable Release")
-[![GitHub Pre-Releases](https://img.shields.io/github/release/MaiyunNET/ClickGo/all.svg)](https://github.com/MaiyunNET/ClickGo/releases "Pre-Release")
+[![License](https://img.shields.io/github/license/maiyun/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/blob/master/LICENSE)
+[![GitHub issues](https://img.shields.io/github/issues/maiyun/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/issues)
+[![GitHub Releases](https://img.shields.io/github/release/maiyun/ClickGo.svg)](https://github.com/MaiyunNET/ClickGo/releases "Stable Release")
+[![GitHub Pre-Releases](https://img.shields.io/github/release/maiyun/ClickGo/all.svg)](https://github.com/MaiyunNET/ClickGo/releases "Pre-Release")
 
 Quickly and easily create a beautiful console interface.
 
 ## Installation
 
-Simply download and include with a script tag. ClickGo will be registered as a global variable.
+Load the module loader first, and then load it using the module loader.
 
-> Don't use the minified version during development. You will miss out on all the nice warnings for common mistakes!
-
-**Development Version**
-
-```html
-<script src="index.js"></script>
-```
-
-**Production Version**
+**index.html**
 
 ```html
-<script src="index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.2.0/dist/loader.min.js?path=index"></script>
 ```
 
-### CDN (recommend)
+**index.js**
 
-Recommended: https://cdn.jsdelivr.net/npm/clickgo@3.0.0/dist/index.min.js (Less than 3kb minified and gzipped), which will reflect the latest version as soon as it is published to npm. You can also browse the source of the npm package at https://cdn.jsdelivr.net/npm/clickgo/.
-
-Also available on [unpkg](https://unpkg.com/clickgo@3.0.0/dist/index.js).
-
-For example:
-
-```html
-<script src="https://cdn.jsdelivr.net/npm/clickgo@3.0.0/dist/index.min.js"></script>
+```typescript
+import * as clickgo from 'clickgo';
+(async function() {
+    await clickgo.init();
+    await clickgo.task.run('xxx');
+})().catch((e) => {
+    console.log(e);
+});
 ```
 
 ### NPM
@@ -58,7 +50,7 @@ $ npm i clickgo@dev --save
 
 ## Note
 
-ClickGo demand loading Vue, jszip, resize-observer, but **DO NOT** reference these JS and CSS files. ClickGo will automatically reference. You only need to reference "index.js".
+ClickGo demand loading Vue, jszip, resize-observer, but **DO NOT** reference these JS and CSS files. ClickGo will automatically reference. You only need to import "clickgo" module.
 
 ## Demo
 

package/dist/clickgo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getNative = exports.getVersion = void 0;
+exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getNative = exports.getVersion = void 0;
 const version = '3.0.0';
 function getVersion() {
     return version;
@@ -29,6 +29,7 @@ function getCdn() {
     return cdn;
 }
 exports.getCdn = getCdn;
+exports.vue = window.Vue;
 exports.control = require("./lib/control");
 exports.core = require("./lib/core");
 exports.dom = require("./lib/dom");

package/dist/clickgo.ts

@@ -39,6 +39,8 @@ export function getCdn(): string {
     return cdn;
 }
 
+export const vue: import('../types/index').IVueObject = (window as any).Vue;
+
 export * as control from './lib/control';
 export * as core from './lib/core';
 export * as dom from './lib/dom';

package/dist/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getNative = exports.getVersion = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
+exports.init = exports.getCdn = exports.setCdn = exports.getSafe = exports.setSafe = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0;
 function getVersion() {
     return exports.clickgo.getVersion();
 }

package/dist/index.ts

@@ -1,3 +1,5 @@
+// npm publish --tag dev --access public
+
 // --- 以下不会真正加载，最终会在底部进行赋值 ---
 export let clickgo: typeof import('./clickgo');
 export let control: typeof import('./lib/control');
@@ -10,6 +12,7 @@ export let task: typeof import('./lib/task');
 export let theme: typeof import('./lib/theme');
 export let tool: typeof import('./lib/tool');
 export let zip: typeof import('./lib/zip');
+export let vue: import('../types/index').IVueObject;
 
 export function getVersion(): string {
     return clickgo.getVersion();

package/dist/lib/core.js

@@ -25,7 +25,7 @@ const configOrigin = {
     'desktop.wallpaper': null,
     'desktop.path': null
 };
-exports.config = Vue.reactive({
+exports.config = clickgo.vue.reactive({
     'locale': 'en',
     'task.position': 'bottom',
     'task.pin': {},
@@ -34,7 +34,7 @@ exports.config = Vue.reactive({
     'desktop.wallpaper': null,
     'desktop.path': null
 });
-Vue.watch(exports.config, function () {
+clickgo.vue.watch(exports.config, function () {
     for (const key in configOrigin) {
         if (exports.config[key] !== undefined) {
             continue;

package/dist/lib/core.ts

@@ -30,7 +30,7 @@ const configOrigin: types.IConfig = {
     'desktop.wallpaper': null,
     'desktop.path': null
 };
-export const config: types.IConfig = Vue.reactive({
+export const config: types.IConfig = clickgo.vue.reactive({
     'locale': 'en',
     'task.position': 'bottom',
     'task.pin': {},
@@ -40,7 +40,7 @@ export const config: types.IConfig = Vue.reactive({
     'desktop.path': null
 });
 
-Vue.watch(config, function() {
+clickgo.vue.watch(config, function() {
     // --- 检测有没有缺少的 config key ---
     for (const key in configOrigin) {
         if ((config as any)[key] !== undefined) {

package/dist/lib/form.js

@@ -133,7 +133,7 @@ const elements = {
         }, {
             'passive': false
         });
-        const simpleSystemtaskApp = Vue.createApp({
+        const simpleSystemtaskApp = clickgo.vue.createApp({
             'template': '<div v-for="(item, formId) of forms" class="cg-simplesystemtask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simplesystemtask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
             'data': function () {
                 return {
@@ -1849,7 +1849,7 @@ function create(opt) {
             dom.pushStyle(taskId, style, 'form', formId);
         }
         const rtn = yield new Promise(function (resolve) {
-            const vapp = Vue.createApp({
+            const vapp = clickgo.vue.createApp({
                 'template': layout.replace(/^<cg-form/, '<cg-form ref="form"'),
                 'data': function () {
                     return tool.clone(data);

package/dist/lib/form.ts

@@ -199,7 +199,7 @@ const elements: {
         }, {
             'passive': false
         });
-        const simpleSystemtaskApp = Vue.createApp({
+        const simpleSystemtaskApp = clickgo.vue.createApp({
             'template': '<div v-for="(item, formId) of forms" class="cg-simplesystemtask-item" @click="click(parseInt(formId))"><div v-if="item.icon" class="cg-simplesystemtask-icon" :style="{\'background-image\': \'url(\' + item.icon + \')\'}"></div><div>{{item.title}}</div></div>',
             'data': function() {
                 return {
@@ -2208,7 +2208,7 @@ export async function create(opt: string | types.IFormCreateOptions): Promise<nu
         'vapp': types.IVueApp;
         'vroot': types.IVForm;
     } = await new Promise(function(resolve) {
-        const vapp = Vue.createApp({
+        const vapp = clickgo.vue.createApp({
             'template': layout!.replace(/^<cg-form/, '<cg-form ref="form"'),
             'data': function() {
                 return tool.clone(data);

package/dist/lib/task.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.run = exports.getList = exports.get = exports.offFrame = exports.onFrame = exports.lastId = exports.list = void 0;
+const clickgo = require("../clickgo");
 const core = require("./core");
 const control = require("./control");
 const dom = require("./dom");
@@ -188,7 +189,7 @@ function run(url, opt = {}) {
             'id': taskId,
             'app': app,
             'customTheme': false,
-            'locale': Vue.reactive({
+            'locale': clickgo.vue.reactive({
                 'lang': '',
                 'data': {}
             }),
@@ -520,12 +521,12 @@ function sleep(fun, delay, taskId, formId) {
     });
 }
 exports.sleep = sleep;
-exports.systemTaskInfo = Vue.reactive({
+exports.systemTaskInfo = clickgo.vue.reactive({
     'taskId': 0,
     'formId': 0,
     'length': 0
 });
-Vue.watch(exports.systemTaskInfo, function (n, o) {
+clickgo.vue.watch(exports.systemTaskInfo, function (n, o) {
     var _a, _b;
     const originKeys = ['taskId', 'formId', 'length'];
     for (const key of originKeys) {

package/dist/lib/task.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import * as types from '../../types';
+import * as clickgo from '../clickgo';
 import * as core from './core';
 import * as control from './control';
 import * as dom from './dom';
@@ -242,7 +243,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         'id': taskId,
         'app': app,
         'customTheme': false,
-        'locale': Vue.reactive({
+        'locale': clickgo.vue.reactive({
             'lang': '',
             'data': {}
         }),
@@ -661,13 +662,13 @@ export function sleep(fun: () => void | Promise<void>, delay: number, taskId?: n
 }
 
 /** --- task 的信息 --- */
-export const systemTaskInfo: types.ISystemTaskInfo = Vue.reactive({
+export const systemTaskInfo: types.ISystemTaskInfo = clickgo.vue.reactive({
     'taskId': 0,
     'formId': 0,
     'length': 0
 });
 
-Vue.watch(systemTaskInfo, function(n, o) {
+clickgo.vue.watch(systemTaskInfo, function(n: any, o: any) {
     const originKeys = ['taskId', 'formId', 'length'];
     // --- 检测有没有缺少的 key ---
     for (const key of originKeys) {

package/dist/lib/zip.ts

@@ -278,7 +278,7 @@ export class Zip {
      */
     private _refreshList(): void {
         const list: Record<string, Record<string, types.IZipItem>> = {};
-        this._zip.forEach(function(relativePath, item) {
+        this._zip.forEach(function(relativePath: string, item: jszip.JSZipObject) {
             if (relativePath.startsWith('/')) {
                 relativePath = relativePath.slice(1);
             }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "clickgo",
-  "version": "3.0.0-dev",
+  "version": "3.0.1-dev2",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
     "ui",
     "clickgo"
   ],
-  "main": "dist/loader.js",
+  "main": "dist/index.js",
   "author": "hanguoshuai",
   "license": "Apache-2.0",
   "types": "./types/index.d.ts",
@@ -21,7 +21,9 @@
     "@typescript-eslint/parser": "^5.17.0",
     "electron": "^18.3.4",
     "eslint": "^8.12.0",
-    "jszip": "^3.10.0",
     "typescript": "^4.6.4"
+  },
+  "dependencies": {
+    "jszip": "^3.10.0"
   }
 }

package/types/index.d.ts

@@ -614,6 +614,17 @@ export interface IVControl extends IVue {
 
 // --- vue ---
 
+export interface IVueObject {
+    createApp(opt: any): IVueApp;
+    ref<T extends number | string>(obj: T): { 'value': T; };
+    reactive<T>(obj: T): T;
+    watch(
+        v: any,
+        cb: (n: any, o: any) => void | Promise<void>,
+        opt: Record<string, string | boolean>
+    ): void;
+}
+
 export type IVueOptionMergeFunction = (to: unknown, from: unknown, instance: IVue) => any;
 
 export interface IVueConfig {

package/types/dev.d.ts

@@ -1,30 +0,0 @@
-declare module 'clickgo' {
-    export const control: typeof import('../dist/lib/control');
-    export const core: typeof import('../dist/lib/core');
-    export const dom: typeof import('../dist/lib/Dom');
-    export const form: typeof import('../dist/lib/Form');
-    export const fs: typeof import('../dist/lib/fs');
-    export const native: typeof import('../dist/lib/native');
-    export const task: typeof import('../dist/lib/task');
-    export const theme: typeof import('../dist/lib/theme');
-    export const tool: typeof import('../dist/lib/tool');
-    export const zip: typeof import('../dist/lib/zip');
-
-    export function getVersion(): string;
-    export function getNative(): boolean;
-    export function setSafe(val: boolean): void;
-    export function getSafe(): boolean;
-    export function setCdn(val: string): void;
-    export function getCdn(): string;
-}
-
-declare namespace Vue {
-    export function createApp(opt: any): import('./index').IVueApp;
-    export function ref<T extends number | string>(obj: T): { 'value': T; };
-    export function reactive<T>(obj: T): T;
-    export function watch(
-        v: any,
-        cb: (n: any, o: any) => void | Promise<void>,
-        opt: Record<string, string | boolean>
-    ): void;
-}