Merge pull request #3 from npmstudy/dev

Dev

example/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "private": true,
   "scripts": {
-    "start": "nodemon dist/app",
+    "start": "tsx --no-cache src/app.ts",
     "build": "tsup src -- --dts-resolve",
     "build:fast": "tsup src",
     "test": "vitest run",
@@ -28,4 +28,4 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
-}
+}

example/src/app.ts

@@ -2,67 +2,70 @@
 import { createServer } from '@tomrpc/core';
 import mount from '@tomrpc/mount';
 
-const rpc = createServer({
-  base: import.meta.url,
-  beforeOne: function (ctx: any, key: string) {
-    console.log(ctx.path);
-    console.log(ctx.method);
-    console.log('beforeOne key=' + key);
-  },
-});
+(async () => {
+  const rpc = createServer({
+    base: import.meta.url,
+    beforeOne: function (ctx: any, key: string) {
+      console.log(ctx.path);
+      console.log(ctx.method);
+      console.log('beforeOne key=' + key);
+    },
+  });
 
-rpc.fn('getUsers', function (a: string) {
-  return {
-    a: a,
-    msg: 'getUsers',
-  };
-});
-
-rpc.fn('postUsers', function (a: string) {
-  return {
-    a: a,
-    msg: 'postUsers',
-  };
-});
-
-rpc.fn('a', (a: string) => {
-  return a;
-});
+  rpc.fn('getUsers', function (a: string) {
+    return {
+      a: a,
+      msg: 'getUsers',
+    };
+  });
 
-rpc.fn('a.a', (a: string, ctx: any) => {
-  // console.dir(ctx);
-  if (ctx.method === 'POST') {
-    console.dir('post');
+  rpc.fn('postUsers', function (a: string) {
     return {
       a: a,
-      // b: b,
+      msg: 'postUsers',
     };
-  } else {
-    console.dir('get' + ctx.method);
+  });
+
+  rpc.fn('a', (a: string) => {
     return a;
-  }
-});
+  });
 
-rpc.fn('b', () => {
-  console.dir('test b');
-});
+  rpc.fn('a.a', (a: string, ctx: any) => {
+    // console.dir(ctx);
+    if (ctx.method === 'POST') {
+      console.dir('post');
+      return {
+        a: a,
+        // b: b,
+      };
+    } else {
+      console.dir('get' + ctx.method);
+      return a;
+    }
+  });
 
-rpc.add({
-  c: (a: string) => {
-    return a;
-  },
-  a: function (a: string, b: string) {
-    return `${this.path} , ${a} c2 ${b}`;
-  },
-});
+  rpc.fn('b', () => {
+    console.dir('test b');
+  });
+
+  rpc.add({
+    c: (a: string) => {
+      return a;
+    },
+    a: function (a: string, b: string) {
+      return `${this.path} , ${a} c2 ${b}`;
+    },
+  });
 
-rpc.base = import.meta.url;
-mount(rpc, './fn');
+  // console.dir(mount);
+  rpc.base = import.meta.url;
+  await mount(rpc, './fn');
 
-// https://bobbyhadz.com/blog/typescript-no-overload-matches-this-call
-// rpc.dump();
-// console.dir(rpc.dump());
+  // https://bobbyhadz.com/blog/typescript-no-overload-matches-this-call
+  // rpc.dump();
+  // console.dir(rpc.dump());
 
-rpc.mount();
+  // rpc.mount();
 
-rpc.listen(3000);
+  rpc.listen(3000);
+})();

packages/app/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @tomrpc/mount
+
+## 1.0.0
+
+### Major Changes
+
+- init

packages/app/README.md

@@ -0,0 +1,31 @@
+
+# @tomrpc/app
+
+
+tom.json
+
+```
+{
+  name:'hi'
+  base: import.meta.url
+  static: 'public'
+  core: true
+  view: true
+  jwt: true
+  port: 3000
+  mount: './fn'
+  lifeCyle: {
+
+  }
+}
+```
+
+
+```js
+import app from '@tomrpc/app';
+
+const rpc = createServer(cfg);
+
+rpc.start();
+
+```

packages/app/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "@tomrpc/app",
+  "version": "1.0.0",
+  "description": "My Awesome lib",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": "npmstudy <[email protected]>",
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsup src -- --dts-resolve",
+    "build:fast": "tsup src",
+    "dev": "tsup src --watch",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "coverage": "vitest run --coverage"
+  },
+  "keywords": [
+    "awesome-keywords"
+  ],
+  "devDependencies": {
+    "@vitest/coverage-v8": "^0.34.2",
+    "happy-dom": "^6.0.4"
+  },
+  "dependencies": {
+    "@tomrpc/import-dir": "^1.2.4",
+    "debug": "^4.3.4",
+    "desm": "^1.3.0",
+    "flat": "^6.0.1"
+  }
+}

packages/app/src/__tests__/index.test.ts

@@ -0,0 +1,9 @@
+import { describe, expect, it } from 'vitest';
+
+import mount from '../mount';
+
+describe('lib', () => {
+  it('should render lib', () => {
+    // expect(lib()).toBe('lib');
+  });
+});

packages/app/src/index.ts

@@ -0,0 +1,25 @@
+import debug from 'debug';
+
+import mount from './mount';
+import { isFunction } from './utils';
+
+const log = debug('@tomrpc/mount');
+
+// {a:{a:1, b:2}}
+// {a.b:2, a.a:1}
+// a.b => /a/b + function
+
+export default async (rpc, dir) => {
+  const files = await mount(rpc.base, dir);
+
+  log(files);
+
+  Object.keys(files).forEach((key) => {
+    if (isFunction(files[key])) {
+      log('add funtion key=' + key);
+      rpc.fn(key, files[key]);
+    } else {
+      console.dir(`key=${key} is not a function`);
+    }
+  });
+};

packages/app/src/mount.ts

@@ -0,0 +1,20 @@
+import importDir, { join } from '@tomrpc/import-dir';
+import debug from 'debug';
+import { flatten } from 'flat';
+
+const log = debug('@tomrpc/mount');
+
+// {a:{a:1, b:2}}
+// {a.b:2, a.a:1}
+// a.b => /a/b + function
+
+export default async (base, dir) => {
+  const files = await importDir(join(base, dir), {
+    recurse: true,
+    extensions: ['.ts', '.js', '.json'],
+  });
+
+  log(files);
+
+  return flatten(files);
+};

packages/app/src/test.ts

@@ -0,0 +1,6 @@
+import mount from './mount';
+
+(async () => {
+  const files = await mount(import.meta.url, './f');
+  console.dir(files);
+})();

packages/app/src/utils.ts

@@ -0,0 +1,18 @@
+const toString = Object.prototype.toString;
+
+export function isFunction(fn) {
+  if (!fn) {
+    return false;
+  }
+  const string = toString.call(fn);
+  return (
+    string === '[object Function]' ||
+    (typeof fn === 'function' && string !== '[object RegExp]') ||
+    (typeof window !== 'undefined' &&
+      // IE8 and below
+      (fn === window.setTimeout ||
+        fn === window.alert ||
+        fn === window.confirm ||
+        fn === window.prompt))
+  );
+}

packages/app/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "vitest/globals"
+    ]
+  }
+}

packages/app/tsup.config.cjs

@@ -0,0 +1,12 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig((options) => ({
+  entry: 'src/index.ts',
+  sourcemap: !options.watch,
+  minify: !options.watch,
+  dts: true,
+  format: ['esm'],
+  loader: {
+    '.js': 'jsx',
+  },
+}));

packages/app/vitest.config.cjs

@@ -0,0 +1,10 @@
+/// <reference types="vitest" />
+
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'happy-dom',
+  },
+});

packages/core/src/index.ts

@@ -88,12 +88,12 @@ export const createServer = function (config?: any) {
             const supportMethods = [];
             httpMethods.forEach(function (m) {
               if (lastKey.indexOf(m) != -1) {
-                console.log(m);
+                log(m);
                 supportMethods.push(m);
                 return m;
               }
             });
-            console.log(supportMethods);
+            // console.log(supportMethods);
 
             if (supportMethods.length === 0) {
               log('没有匹配到包含get/post等方法的函数');

packages/mount/README.md

@@ -0,0 +1,23 @@
+
+# @tomrpc/mount
+
+
+```js
+import mount from '@tomrpc/mount';
+
+
+const rpc = createServer({
+    base: import.meta.url,
+    beforeOne: function (ctx: any, key: string) {
+    console.log(ctx.path);
+    console.log(ctx.method);
+    console.log('beforeOne key=' + key);
+  },
+});
+
+rpc.base = import.meta.url;
+mount(rpc, './fn');
+
+rpc.listen(3000);
+
+```

packages/mount/package.json

@@ -6,7 +6,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "author": "npmstudy <npmstudy@126.com>",
+  "author": "npmstudy <npmstudy@qq.com>",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -29,9 +29,9 @@
     "happy-dom": "^6.0.4"
   },
   "dependencies": {
-    "@tomrpc/import-dir": "^1.2.2",
+    "@tomrpc/import-dir": "^1.2.4",
     "debug": "^4.3.4",
     "desm": "^1.3.0",
     "flat": "^6.0.1"
   }
-}
+}