@typespec/spector 0.1.0-alpha.10-dev.5 → 0.1.0-alpha.10-dev.6

package/dist/src/actions/validate-mock-apis.js

@@ -22,7 +22,7 @@ export async function validateMockApis({ scenariosPath, exitDueToPreviousError,
             d.target.kind === "Namespace" &&
             d.target.name === "DPG"));
         if (programDiagnostics.length > 0) {
-            specCompiler.logDiagnostics(programDiagnostics, { log: logger.error });
+            specCompiler.logDiagnostics(programDiagnostics, specCompiler.NodeHost.logSink);
             diagnostics.reportDiagnostic({
                 message: `Scenario ${name} is invalid.`,
             });

package/dist/src/actions/validate-mock-apis.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-mock-apis.js","sourceRoot":"","sources":["../../../src/actions/validate-mock-apis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAQ3E,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,aAAa,EACb,sBAAsB,EACtB,gBAAgB,GACO;IACvB,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAC;IAC/C,KAAK,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,aAAa,EAAE,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,mBAAmB,YAAY,GAAG,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE;YAC9E,MAAM,EAAE,IAAI;YACZ,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,6DAA6D;QAC7D,MAAM,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CACnD,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CACC,CAAC,CAAC,IAAI,KAAK,+CAA+C;YAC1D,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ;YAC5B,MAAM,IAAI,CAAC,CAAC,MAAM;YAClB,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;YAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CACxB,CACJ,CAAC;QAEF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,YAAY,CAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YACvE,WAAW,CAAC,gBAAgB,CAAC;gBAC3B,OAAO,EAAE,YAAY,IAAI,cAAc;aACxC,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC;QACjF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,WAAW,CAAC,gBAAgB,CAAC;gBAC3B,OAAO,EAAE,YAAY,IAAI,2EAA2E;aACrG,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,8BAA8B,IAAI,cAAc,CAAC,CAAC;YAE/D,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAEpD,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACvD,YAAY,GAAG,IAAI,CAAC;gBACpB,WAAW,CAAC,gBAAgB,CAAC;oBAC3B,OAAO,EAAE,YAAY,QAAQ,CAAC,IAAI,qCAAqC,IAAI,iBAAiB;iBAC7F,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,IAAI,iCAAiC,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAED,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,IAAI,sBAAsB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAChD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,sBAAsB;YAAE,OAAO,sBAAsB,CAAC;;YACrD,OAAO,KAAK,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"validate-mock-apis.js","sourceRoot":"","sources":["../../../src/actions/validate-mock-apis.ts"],"names":[],"mappings":"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"}

package/dist/src/logger.d.ts

@@ -1,3 +1,17 @@
-import winston from "winston";
-export declare const logger: winston.Logger;
+declare const levels: {
+    debug: number;
+    info: number;
+    warn: number;
+    error: number;
+};
+type Level = keyof typeof levels;
+interface Logger {
+    level: Level;
+    debug: (message: string, ...data: unknown[]) => void;
+    info: (message: string, ...data: unknown[]) => void;
+    warn: (message: string, ...data: unknown[]) => void;
+    error: (message: string, ...data: unknown[]) => void;
+}
+export declare const logger: Logger;
+export {};
 //# sourceMappingURL=logger.d.ts.map

package/dist/src/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,eAAO,MAAM,MAAM,gBAOjB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,MAAM;;;;;CAKX,CAAC;AAEF,KAAK,KAAK,GAAG,MAAM,OAAO,MAAM,CAAC;AAQjC,UAAU,MAAM;IACd,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACrD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACtD;AAED,eAAO,MAAM,MAAM,EAAE,MAMpB,CAAC"}

package/dist/src/logger.js

@@ -1,10 +1,29 @@
-import winston from "winston";
-export const logger = winston.createLogger({
+/* eslint-disable no-console */
+import pc from "picocolors";
+const levels = {
+    debug: 10,
+    info: 20,
+    warn: 30,
+    error: 30,
+};
+const levelDisplay = {
+    debug: pc.blue("debug"),
+    info: pc.green("info"),
+    warn: pc.yellow("warn"),
+    error: pc.red("error"),
+};
+export const logger = {
     level: "info",
-    transports: [
-        new winston.transports.Console({
-            format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
-        }),
-    ],
-});
+    debug: log("debug"),
+    info: log("info"),
+    warn: log("warn"),
+    error: log("error"),
+};
+function log(level) {
+    return (message, ...data) => {
+        if (levels[level] >= levels[logger.level]) {
+            console.log(levelDisplay[level], message, ...data);
+        }
+    };
+}
 //# sourceMappingURL=logger.js.map

package/dist/src/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,CAAC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IACzC,KAAK,EAAE,MAAM;IACb,UAAU,EAAE;QACV,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;YAC7B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;SACnF,CAAC;KACH;CACF,CAAC,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;CACV,CAAC;AAGF,MAAM,YAAY,GAA0B;IAC1C,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IACvB,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;IACtB,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IACvB,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;CACvB,CAAC;AAUF,MAAM,CAAC,MAAM,MAAM,GAAW;IAC5B,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;CACpB,CAAC;AAEF,SAAS,GAAG,CAAC,KAAY;IACvB,OAAO,CAAC,OAAe,EAAE,GAAG,IAAe,EAAE,EAAE;QAC7C,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/spector",
-  "version": "0.1.0-alpha.10-dev.5",
+  "version": "0.1.0-alpha.10-dev.6",
   "description": "Typespec Core Tool to validate, run mock api, collect coverage.",
   "exports": {
     ".": {
@@ -46,7 +46,6 @@
     "multer": "^1.4.5-lts.1",
     "picocolors": "~1.1.1",
     "source-map-support": "~0.5.21",
-    "winston": "^3.17.0",
     "xml2js": "^0.6.2",
     "yargs": "~17.7.2"
   },

package/src/actions/validate-mock-apis.ts

@@ -41,7 +41,7 @@ export async function validateMockApis({
     );
 
     if (programDiagnostics.length > 0) {
-      specCompiler.logDiagnostics(programDiagnostics, { log: logger.error });
+      specCompiler.logDiagnostics(programDiagnostics, specCompiler.NodeHost.logSink);
       diagnostics.reportDiagnostic({
         message: `Scenario ${name} is invalid.`,
       });

package/src/logger.ts

@@ -1,10 +1,41 @@
-import winston from "winston";
+/* eslint-disable no-console */
+import pc from "picocolors";
 
-export const logger = winston.createLogger({
+const levels = {
+  debug: 10,
+  info: 20,
+  warn: 30,
+  error: 30,
+};
+
+type Level = keyof typeof levels;
+const levelDisplay: Record<Level, string> = {
+  debug: pc.blue("debug"),
+  info: pc.green("info"),
+  warn: pc.yellow("warn"),
+  error: pc.red("error"),
+};
+
+interface Logger {
+  level: Level;
+  debug: (message: string, ...data: unknown[]) => void;
+  info: (message: string, ...data: unknown[]) => void;
+  warn: (message: string, ...data: unknown[]) => void;
+  error: (message: string, ...data: unknown[]) => void;
+}
+
+export const logger: Logger = {
   level: "info",
-  transports: [
-    new winston.transports.Console({
-      format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
-    }),
-  ],
-});
+  debug: log("debug"),
+  info: log("info"),
+  warn: log("warn"),
+  error: log("error"),
+};
+
+function log(level: Level) {
+  return (message: string, ...data: unknown[]) => {
+    if (levels[level] >= levels[logger.level]) {
+      console.log(levelDisplay[level], message, ...data);
+    }
+  };
+}