@learnpack/learnpack 2.1.35 → 2.1.37

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @learnpack/learnpack
 $ learnpack COMMAND
 running command...
 $ learnpack (-v|--version|version)
-@learnpack/learnpack/2.1.35 darwin-arm64 node-v16.20.0
+@learnpack/learnpack/2.1.37 darwin-arm64 node-v16.20.1
 $ learnpack --help [COMMAND]
 USAGE
   $ learnpack COMMAND
@@ -74,7 +74,7 @@ DESCRIPTION
        12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)
 ```
 
-_See code: [src/commands/audit.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/audit.ts)_
+_See code: [src/commands/audit.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/audit.ts)_
 
 ## `learnpack clean`
 
@@ -89,7 +89,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/clean.ts)_
 
 ## `learnpack download [PACKAGE]`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   Extra documentation goes here
 ```
 
-_See code: [src/commands/download.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/download.ts)_
+_See code: [src/commands/download.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/download.ts)_
 
 ## `learnpack help [COMMAND]`
 
@@ -138,7 +138,7 @@ OPTIONS
   -h, --grading  show CLI help
 ```
 
-_See code: [src/commands/init.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/init.ts)_
 
 ## `learnpack login [PACKAGE]`
 
@@ -156,7 +156,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/login.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/login.ts)_
 
 ## `learnpack logout [PACKAGE]`
 
@@ -174,7 +174,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/logout.ts)_
 
 ## `learnpack plugins`
 
@@ -309,7 +309,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/publish.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/publish.ts)_
+_See code: [src/commands/publish.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/publish.ts)_
 
 ## `learnpack start`
 
@@ -330,7 +330,7 @@ OPTIONS
   -w, --watch                         Watch for file changes
 ```
 
-_See code: [src/commands/start.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/start.ts)_
+_See code: [src/commands/start.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/start.ts)_
 
 ## `learnpack test [EXERCISESLUG]`
 
@@ -344,7 +344,7 @@ ARGUMENTS
   EXERCISESLUG  The name of the exercise to test
 ```
 
-_See code: [src/commands/test.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.35/src/commands/test.ts)_
+_See code: [src/commands/test.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.37/src/commands/test.ts)_
 <!-- commandsstop -->
 
 > > > > > > > 0cb3e56d84c197f9d008836bb573eade212b7e57

package/lib/commands/start.js

@@ -46,7 +46,6 @@ class StartCommand extends SessionCommand_1.default {
                     const agent = ((_d = configObject.config) === null || _d === void 0 ? void 0 : _d.editor.agent) || "";
                     const path = ((_e = configObject.config) === null || _e === void 0 ? void 0 : _e.dirPath) || "";
                     const tutorialSlug = ((_f = configObject.config) === null || _f === void 0 ? void 0 : _f.slug) || "";
-                    console_1.default.info("Starting Telemetry with slug...", tutorialSlug);
                     const steps = configObject.exercises.map((e, index) => ({
                         slug: e.slug,
                         position: e.position || index,

package/lib/managers/config/exercise.js

@@ -82,11 +82,14 @@ exports.exercise = (path, position, configObject) => {
                 fs.mkdirSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets`);
             if (!fs.existsSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets/` + this.slug)) {
                 fs.mkdirSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets/` + this.slug);
-                for (const _file of this.files) {
-                    const fileContent = fs.readFileSync(_file.path);
-                    if (!fs.existsSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets/${this.slug}/${_file.name}`)) {
-                        fs.writeFileSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets/${this.slug}/${_file.name}`, fileContent);
-                    }
+            }
+            for (const _file of this.files) {
+                const stats = fs.statSync(_file.path);
+                if (stats.isDirectory() || _file.hidden)
+                    continue;
+                const fileContent = fs.readFileSync(_file.path);
+                if (!fs.existsSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets/${this.slug}/${_file.name}`)) {
+                    fs.writeFileSync(`${config === null || config === void 0 ? void 0 : config.dirPath}/resets/${this.slug}/${_file.name}`, fileContent);
                 }
             }
             return content;

package/lib/managers/config/index.js

@@ -197,6 +197,8 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
                     fs.unlinkSync(configObj.config.dirPath + "/app.tar.gz");
                 if (fs.existsSync(configObj.config.dirPath + "/config.json"))
                     fs.unlinkSync(configObj.config.dirPath + "/config.json");
+                if (fs.existsSync(configObj.config.dirPath + "/telemetry.json"))
+                    fs.unlinkSync(configObj.config.dirPath + "/telemetry.json");
                 if (fs.existsSync(configObj.config.dirPath + "/vscode_queue.json"))
                     fs.unlinkSync(configObj.config.dirPath + "/vscode_queue.json");
             }

package/lib/managers/telemetry.d.ts

@@ -42,7 +42,7 @@ declare type TStudent = {
 };
 export interface ITelemetryJSONSchema {
     telemetry_id?: string;
-    student?: TStudent;
+    user_id?: number | string;
     slug: string;
     agent?: string;
     tutorial_started_at?: number;

package/lib/managers/telemetry.js

@@ -48,11 +48,18 @@ const TelemetryManager = {
             });
         }
     },
+    // verifyStudent: function () {
+    //   if (!this.current) {
+    //     return;
+    //   }
+    //   if (!this.current.user_id) {
+    //   }
+    // },
     setStudent: function (student) {
         if (!this.current) {
             return;
         }
-        this.current.student = student;
+        this.current.user_id = student.user_id;
         this.save();
         this.submit();
     },
@@ -88,6 +95,10 @@ const TelemetryManager = {
         if (data.stderr) {
             data.stderr = stringToBase64(data.stderr);
         }
+        if (Object.prototype.hasOwnProperty.call(data, "exitCode")) {
+            data.exit_code = data.exitCode;
+            data.exitCode = undefined;
+        }
         switch (event) {
             case "compile":
                 if (!step.compilations) {
@@ -172,19 +183,17 @@ const TelemetryManager = {
         });
     },
     streamEvent: async function (stepPosition, event, data) {
-        var _a;
         if (!this.current)
             return;
         const url = this.urls.streaming;
         if (!url) {
             return;
-            // throw new Error("Streaming URL not specified");
         }
         const stepSlug = this.current.steps[stepPosition].slug;
         const body = {
             slug: stepSlug,
             telemetry_id: this.current.telemetry_id,
-            user_id: (_a = this.current.student) === null || _a === void 0 ? void 0 : _a.user_id,
+            user_id: this.current.user_id,
             step_position: stepPosition,
             event,
             data,

package/lib/utils/audit.js

@@ -39,7 +39,7 @@ const checkForEmptySpaces = (str) => {
     return isEmpty;
 };
 const checkLearnpackClean = (configObj, errors) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     if ((((_a = configObj.config) === null || _a === void 0 ? void 0 : _a.outputPath) &&
         fs.existsSync((_b = configObj.config) === null || _b === void 0 ? void 0 : _b.outputPath)) ||
         fs.existsSync(`${(_c = configObj.config) === null || _c === void 0 ? void 0 : _c.dirPath}/_app`) ||
@@ -47,7 +47,8 @@ const checkLearnpackClean = (configObj, errors) => {
         fs.existsSync(`${(_e = configObj.config) === null || _e === void 0 ? void 0 : _e.dirPath}/resets`) ||
         fs.existsSync(`${(_f = configObj.config) === null || _f === void 0 ? void 0 : _f.dirPath}/app.tar.gz`) ||
         fs.existsSync(`${(_g = configObj.config) === null || _g === void 0 ? void 0 : _g.dirPath}/config.json`) ||
-        fs.existsSync(`${(_h = configObj.config) === null || _h === void 0 ? void 0 : _h.dirPath}/vscode_queue.json`)) {
+        fs.existsSync(`${(_h = configObj.config) === null || _h === void 0 ? void 0 : _h.dirPath}/vscode_queue.json`) ||
+        fs.existsSync(`${(_j = configObj.config) === null || _j === void 0 ? void 0 : _j.dirPath}/telemetry.json`)) {
         errors.push({
             exercise: undefined,
             msg: "You have to run learnpack clean command",

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.1.35","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n    1. The configuration object has slug, repository and description. (Error)\n    2. The command learnpack clean has been run. (Error)\n    3. If a markdown or test file doesn't have any content. (Error)\n    4. The links are accessing to valid servers. (Error)\n    5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n    6. The external images are working (If they are pointing to a valid server). (Error)\n    7. The exercises directory names are valid. (Error)\n    8. If an exercise doesn't have a README file. (Error)\n    9. The exercises array (Of the config file) has content. (Error)\n    10. The exercses have the same translations. (Warning)\n    11. The .gitignore file exists. (Warning)\n    12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[standalone, gitpod]","options":["standalone","gitpod"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}
+{"version":"2.1.37","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n    1. The configuration object has slug, repository and description. (Error)\n    2. The command learnpack clean has been run. (Error)\n    3. If a markdown or test file doesn't have any content. (Error)\n    4. The links are accessing to valid servers. (Error)\n    5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n    6. The external images are working (If they are pointing to a valid server). (Error)\n    7. The exercises directory names are valid. (Error)\n    8. If an exercise doesn't have a README file. (Error)\n    9. The exercises array (Of the config file) has content. (Error)\n    10. The exercses have the same translations. (Warning)\n    11. The .gitignore file exists. (Warning)\n    12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[standalone, gitpod]","options":["standalone","gitpod"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Create, sell or download and take learning amazing learning packages",
-  "version": "2.1.35",
+  "version": "2.1.37",
   "author": "Alejandro Sanchez @alesanchezr",
   "bin": {
     "learnpack": "bin/run"

package/src/commands/start.ts

@@ -121,7 +121,6 @@ export default class StartCommand extends SessionCommand {
           const path = configObject.config?.dirPath || ""
           const tutorialSlug = configObject.config?.slug || ""
 
-          Console.info("Starting Telemetry with slug...", tutorialSlug)
           const steps = configObject.exercises.map(
             (e: IExercise, index): TStep => ({
               slug: e.slug,

package/src/managers/config/exercise.ts

@@ -121,18 +121,20 @@ lang = null
         fs.mkdirSync(`${config?.dirPath}/resets`)
       if (!fs.existsSync(`${config?.dirPath}/resets/` + this.slug)) {
         fs.mkdirSync(`${config?.dirPath}/resets/` + this.slug)
-        for (const _file of this.files) {
-          const fileContent = fs.readFileSync(_file.path)
-          if (
-            !fs.existsSync(
-              `${config?.dirPath}/resets/${this.slug}/${_file.name}`
-            )
-          ) {
-            fs.writeFileSync(
-              `${config?.dirPath}/resets/${this.slug}/${_file.name}`,
-              fileContent
-            )
-          }
+      }
+
+      for (const _file of this.files) {
+        const stats = fs.statSync(_file.path)
+        if (stats.isDirectory() || _file.hidden) 
+continue
+        const fileContent = fs.readFileSync(_file.path)
+        if (
+          !fs.existsSync(`${config?.dirPath}/resets/${this.slug}/${_file.name}`)
+        ) {
+          fs.writeFileSync(
+            `${config?.dirPath}/resets/${this.slug}/${_file.name}`,
+            fileContent
+          )
         }
       }
 

package/src/managers/config/index.ts

@@ -278,6 +278,9 @@ return true
         if (fs.existsSync(configObj.config.dirPath + "/config.json"))
           fs.unlinkSync(configObj.config.dirPath + "/config.json")
 
+        if (fs.existsSync(configObj.config.dirPath + "/telemetry.json"))
+          fs.unlinkSync(configObj.config.dirPath + "/telemetry.json")
+
         if (fs.existsSync(configObj.config.dirPath + "/vscode_queue.json"))
           fs.unlinkSync(configObj.config.dirPath + "/vscode_queue.json")
       }

package/src/managers/telemetry.ts

@@ -62,7 +62,7 @@ type TStudent = {
 
 export interface ITelemetryJSONSchema {
   telemetry_id?: string;
-  student?: TStudent;
+  user_id?: number | string;
   slug: string;
   agent?: string;
   tutorial_started_at?: number;
@@ -147,13 +147,22 @@ const TelemetryManager: ITelemetryManager = {
         })
     }
   },
+  // verifyStudent: function () {
+  //   if (!this.current) {
+  //     return;
+  //   }
+
+  //   if (!this.current.user_id) {
+
+  //   }
+  // },
 
   setStudent: function (student) {
     if (!this.current) {
       return
     }
 
-    this.current.student = student
+    this.current.user_id = student.user_id
     this.save()
     this.submit()
   },
@@ -199,6 +208,11 @@ const TelemetryManager: ITelemetryManager = {
       data.stderr = stringToBase64(data.stderr)
     }
 
+    if (Object.prototype.hasOwnProperty.call(data, "exitCode")) {
+      data.exit_code = data.exitCode
+      data.exitCode = undefined
+    }
+
     switch (event) {
       case "compile":
         if (!step.compilations) {
@@ -308,7 +322,6 @@ return
     const url = this.urls.streaming
     if (!url) {
       return
-      // throw new Error("Streaming URL not specified");
     }
 
     const stepSlug = this.current.steps[stepPosition].slug
@@ -316,7 +329,7 @@ return
     const body = {
       slug: stepSlug,
       telemetry_id: this.current.telemetry_id,
-      user_id: this.current.student?.user_id,
+      user_id: this.current.user_id,
       step_position: stepPosition,
       event,
       data,

package/src/utils/audit.ts

@@ -62,7 +62,8 @@ const checkLearnpackClean = (configObj: IConfigObj, errors: IAuditErrors[]) => {
     fs.existsSync(`${configObj.config?.dirPath}/resets`) ||
     fs.existsSync(`${configObj.config?.dirPath}/app.tar.gz`) ||
     fs.existsSync(`${configObj.config?.dirPath}/config.json`) ||
-    fs.existsSync(`${configObj.config?.dirPath}/vscode_queue.json`)
+    fs.existsSync(`${configObj.config?.dirPath}/vscode_queue.json`) ||
+    fs.existsSync(`${configObj.config?.dirPath}/telemetry.json`)
   ) {
     errors.push({
       exercise: undefined,