ngx-redi-core 1.2.1 → 1.2.2

package/RediDragDrop/index.ts

@@ -1,3 +1,2 @@
 
-export * from './public-api';
-export * from './src/modules/redi-drag-drop.module';
+export * from './public-api';

package/RediDragDrop/public-api.ts

@@ -1,6 +1,5 @@
-export { ProcesoArchivoCsv } from './src/models/classes/proceso-archivo-csv';
-export { DragDropDirective } from './src/models/directives/drag-drop.directive';
 
-
-export { RediDragDropModule } from './src/modules/redi-drag-drop.module';
-export { RediDragDropComponent } from './src/modules/redi-drag-drop/redi-drag-drop.component';
+export * from './src/modules/redi-drag-drop.module';
+export * from './src/modules/redi-drag-drop/redi-drag-drop.component';
+export * from './src/models/classes/proceso-archivo-csv';
+export * from './src/models/directives/drag-drop.directive';

package/RediDragDrop/src/assets/cloud.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M250 896q-86 0-148-62T40 686q0-78 49.5-137.5T217 477q20-97 94-158.5T482 257q113 0 189.5 81.5T748 534v24q72-2 122 46.5T920 727q0 69-50 119t-119 50H510q-24 0-42-18t-18-42V578l-83 83-43-43 156-156 156 156-43 43-83-83v258h241q45 0 77-32t32-77q0-45-32-77t-77-32h-63v-84q0-89-60.5-153T478 317q-89 0-150 64t-61 153h-19q-62 0-105 43.5T100 685q0 62 43.929 106.5Q187.857 836 250 836h140v60H250Zm230-290Z" style="fill:rgb(131, 131, 131);"/></svg>

package/RediDragDrop/src/assets/documento.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M319 806h322v-60H319v60Zm0-170h322v-60H319v60Zm-99 340q-24 0-42-18t-18-42V236q0-24 18-42t42-18h361l219 219v521q0 24-18 42t-42 18H220Zm331-554V236H220v680h520V422H551ZM220 236v186-186 680-680Z" style="fill:rgb(131, 131, 131);"/></svg>

package/RediDragDrop/src/assets/lista.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="m612 506 141-142-28-28-113 113-57-57-28 29 85 85ZM120 896v-60h480v60H120Zm519.894-290Q561 606 505.5 550.394t-55.5-134.5Q450 337 505.606 281.5t134.5-55.5Q719 226 774.5 281.606t55.5 134.5Q830 495 774.394 550.5t-134.5 55.5ZM120 556v-60h262q5.32 16.323 12.16 31.161Q401 542 409 556H120Zm0 170v-60h419q13.8 6.364 29.4 10.682Q584 681 600 683v43H120Z" style="fill:rgb(131, 131, 131);"/></svg>

package/RediDragDrop/src/models/classes/proceso-archivo-csv.spec.ts

@@ -62,4 +62,11 @@ describe('ProcesoArchivoCsv', () => {
       expect(d).toBeTruthy();
     });
   });
+
+  it('Método generar columnas > arreglo objetos', () => {
+    const proceso = new ProcesoArchivoCsv();
+    const columnas = proceso.generaColumnas('1,mass,"salinas, antonio "1","2"",""');
+    const noColumnas = 4;
+    expect(columnas.length).toEqual(noColumnas);
+  });
 });

package/RediDragDrop/src/models/classes/proceso-archivo-csv.ts

@@ -58,8 +58,13 @@ export class ProcesoArchivoCsv {
       .map((str: string) => { return str.replace(/ /g, '-').trim(); }).filter((stringArchivos: string) => stringArchivos.length > 0);
 
     const datosSeparados = lineasTextTotales.filter((valor: string, indice: number) => indice > 0 && valor.length > 0)
-      .map((dato: string, indice: number) => {
-        return dato.split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/g);
+      .map((dato: string) => {
+        if (dato.includes('"')) {
+          return this.generaColumnas(dato.trim());
+        }
+        else {
+          return dato.split(',');
+        }
       });
 
     if (datosParaDataGrid) {
@@ -85,8 +90,44 @@ export class ProcesoArchivoCsv {
           informacion.push(objeto);
         });
       }
-
-
     return [informacion, columnas];
   }
+
+  /**
+   * Método para separa las filar del csv en columnas.
+   * @param fila La cadena a separar para generar las columnas
+   * @returns Arreglo con las columnas
+   */
+  generaColumnas(fila: string) {
+    const values = [];
+    const separadorTemporal = 'ꜛ';
+    let estaEnComillas = false;
+    let val = '';
+    fila = fila.replaceAll('""', separadorTemporal);
+    [...fila].forEach((letra: string, indice: number) => {
+      switch (letra) {
+        case ',':
+          if (estaEnComillas) {
+            val += letra;
+          } else {
+            values.push(val);
+            val = '';
+          }
+          break;
+        case '"':
+          if (estaEnComillas && indice + 1 < fila.length && fila[indice + 1] === '"') {
+            val += '"';
+          }
+          else {
+            estaEnComillas = !estaEnComillas;
+          }
+          break;
+        default:
+          val += fila[indice];
+          break;
+      }
+    });
+    values.push(val);
+    return values.map(columnas => columnas.replaceAll(separadorTemporal, '"'));
+  }
 }

package/RediDragDrop/src/modules/redi-drag-drop/redi-drag-drop.component.scss

@@ -27,18 +27,18 @@
     width: 75px;
     height: 75px;
     margin: 0 auto;
-    background-image:  url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M250 896q-86 0-148-62T40 686q0-78 49.5-137.5T217 477q20-97 94-158.5T482 257q113 0 189.5 81.5T748 534v24q72-2 122 46.5T920 727q0 69-50 119t-119 50H510q-24 0-42-18t-18-42V578l-83 83-43-43 156-156 156 156-43 43-83-83v258h241q45 0 77-32t32-77q0-45-32-77t-77-32h-63v-84q0-89-60.5-153T478 317q-89 0-150 64t-61 153h-19q-62 0-105 43.5T100 685q0 62 43.929 106.5Q187.857 836 250 836h140v60H250Zm230-290Z" style="fill:rgb(131, 131, 131);"/></svg>');
+    background-image:  url(../../assets/cloud.svg);
     background-repeat: no-repeat;
     background-position: center;
     background-size: contain;
 }
 
 .archivo {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="M319 806h322v-60H319v60Zm0-170h322v-60H319v60Zm-99 340q-24 0-42-18t-18-42V236q0-24 18-42t42-18h361l219 219v521q0 24-18 42t-42 18H220Zm331-554V236H220v680h520V422H551ZM220 236v186-186 680-680Z" style="fill:rgb(131, 131, 131);"/></svg>') !important;
+    background-image: url(../../assets/documento.svg) !important;
 }
 
 .archivo-lista {
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 96 960 960" width="48"><path d="m612 506 141-142-28-28-113 113-57-57-28 29 85 85ZM120 896v-60h480v60H120Zm519.894-290Q561 606 505.5 550.394t-55.5-134.5Q450 337 505.606 281.5t134.5-55.5Q719 226 774.5 281.606t55.5 134.5Q830 495 774.394 550.5t-134.5 55.5ZM120 556v-60h262q5.32 16.323 12.16 31.161Q401 542 409 556H120Zm0 170v-60h419q13.8 6.364 29.4 10.682Q584 681 600 683v43H120Z" style="fill:rgb(131, 131, 131);"/></svg>') !important;
+    background-image: url(../../assets/lista.svg) !important;
 }
 
 

package/RediDragDrop/src/modules/redi-drag-drop.module.ts

@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
 import { RediDragDropComponent } from './redi-drag-drop/redi-drag-drop.component';
 
 
@@ -14,14 +15,11 @@ import { DragDropDirective } from '../models/directives/drag-drop.directive';
     DragDropDirective
   ],
   imports: [
-    MatListModule,
-    MatButtonModule,
-    MatIconModule,
-    MatRippleModule
+    CommonModule,
+    MatListModule, MatButtonModule, MatIconModule, MatRippleModule
   ],
   exports: [
-    RediDragDropComponent,
-    DragDropDirective
+    RediDragDropComponent
   ]
 })
 export class RediDragDropModule { }

package/karma.conf

@@ -1,40 +1,40 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular-devkit/build-angular'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage'),
-      require('@angular-devkit/build-angular/plugins/karma')
-    ],
-    client: {
-      jasmine: {
-        // you can add configuration options for Jasmine here
-        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
-        // for example, you can disable the random execution with `random: false`
-        // or set a specific seed with `seed: 4321`
-      },
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    jasmineHtmlReporter: {
-      suppressAll: true // removes the duplicated traces
-    },
-    coverageReporter: {
-      dir: require('path').join(__dirname, '../../coverage/ngx-redi-core'),
-      subdir: '.',
-      reporters: [
-        { type: 'html' },
-        { type: 'text-summary' },
-        { type: 'lcov' },
-      ]
-    },
-    reporters: ['progress', 'kjhtml'],
-    browsers: ['Chrome'],
-    restartOnFileChange: true,
-  });
-};
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
+    coverageReporter: {
+      dir: require('path').join(__dirname, '../../coverage/ngx-redi-core'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' },
+        { type: 'lcov' },
+      ]
+    },
+    reporters: ['progress', 'kjhtml'],
+    browsers: ['Chrome'],
+    restartOnFileChange: true,
+  });
+};

package/package.json

@@ -1,20 +1,37 @@
 {
   "name": "ngx-redi-core",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "peerDependencies": {
+  },
+  "dependencies": {
+    "@angular/material": "^15.2.9",
+    "tslib": "^2.5.0",
     "@angular/cdk": "^15.2.9",
     "@angular/animations": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/compiler": "^15.2.9",
     "@angular/core": "^15.2.9",
     "@angular/forms": "^15.2.9",
-    "@angular/material": "^15.2.9",
     "@angular/platform-browser": "^15.2.9",
     "@angular/platform-browser-dynamic": "^15.2.9",
-    "@angular/router": "^15.2.9"
+    "@angular/router": "^15.2.9",
+    "rxjs": "~7.8.1",
+    "zone.js": "~0.13.0",
+    "reflect-metadata": "0.1.13"
   },
-  "dependencies": {
-    "tslib": "^2.5.0"
+  "devDependencies": {
+    "@angular/cdk": "^15.2.9",
+    "@angular/animations": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/compiler": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/material": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/platform-browser-dynamic": "^15.2.9",
+    "@angular/router": "^15.2.9",
+    "rxjs": "~7.8.1",
+    "zone.js": "~0.13.0"
   },
   "sideEffects": false
 }