Merge remote-tracking branch 'origin/feature/v-html' into feature/v-html

Author: tronsha

src/Compiler.php

@@ -278,14 +278,14 @@ public function registerProperties(DOMElement $scriptElement)
             }
         }
 
-        $typeScriptRegexProps = '/\@Prop\(.*?default\s*\:\s*(\'(?:.(?!(?<![\\\\])\'))*.?\'|"(?:.(?!(?<![\\\\])"))*.?"|[^\s,]+).*?\)[^;]*?([a-zA-Z0-9_$]+)\!?\:[^;]*;/msx';
+        $typeScriptRegexProps = '/\@Prop\(.*?default\s*\:\s*(?<defaultValue>\'(?:[^\n](?!(?<![\\\\])\'))*.?\'|"(?:[^\n](?!(?<![\\\\])"))*.?"|[a-zA-Z0-9_]+).*?\)[^;]*?(?<propName>[a-zA-Z0-9_$]+)\!?\:[^;\@]*;/msx';
 
         if (preg_match_all($typeScriptRegexProps, $content, $typeScriptMatches, PREG_SET_ORDER )) {
             $this->properties = [];
             foreach ($typeScriptMatches as $typeScriptMatch) {
-                $property = new Property($typeScriptMatch[2], '', true);
-                $property->setDefault(trim($typeScriptMatch[1]));
-                $this->properties[$typeScriptMatch[2]] = $property;
+                $property = new Property($typeScriptMatch['propName'], '', true);
+                $property->setDefault(trim($typeScriptMatch['defaultValue']));
+                $this->properties[$typeScriptMatch['propName']] = $property;
             }
         }
     }

tests/CompilerPropsTest.php

@@ -39,4 +39,5 @@ public function registersTypeScriptProperties()
 
         $this->assertEqualHtml($expected, $actual);
     }
+
 }

tests/fixtures/vue-props/binding-props-typescript-default.twig

@@ -1,4 +1,9 @@
-{% set test = test|default('foo') %}
+{% set propBoolean = propBoolean|default(false) %}
+{% set propPresent = propPresent|default('') %}
+{% set propWithTypeNumber = propWithTypeNumber|default(0) %}
+{% set propPresentWithTypeAndDefault = propPresentWithTypeAndDefault|default('foo') %}
+{% set propPresentWithApostrophe = propPresentWithApostrophe|default('I\'m a text') %}
+{% set propPresentWithAt = propPresentWithAt|default('[email protected]') %}
 <div class="{{class|default('')}}">
   {{ test }}
 </div>

tests/fixtures/vue-props/binding-props-typescript-default.vue

@@ -1,14 +1,20 @@
 <template>
-<div>
-  {{ test }}
-</div>
+  <div>
+    {{ test }}
+  </div>
 </template>
 
 <script lang="ts">
-  import { Vue, Component, Prop } from 'vue-property-decorator';
+    import { Component, Prop, Vue } from 'vue-property-decorator';
 
-  @Component
-  export default class FromPrice extends Vue {
-    @Prop({ type: String, default: 'foo' }) readonly test!: string;
-  }
+    @Component
+    export default class PropsExample extends Vue {
+        @Prop({ type: Boolean, required: true }) ignored: boolean;
+        @Prop({ default: false }) propBoolean: string;
+        @Prop({ default: '' }) propPresent!: string;
+        @Prop({ default: 0, type: Number }) propWithTypeNumber!: number;
+        @Prop({ type: String, default: 'foo' }) readonly propPresentWithTypeAndDefault!: string;
+        @Prop({ default: 'I\'m a text' }) readonly propPresentWithApostrophe!: string;
+        @Prop({ default: '[email protected]' }) readonly propPresentWithAt!: string;
+    }
 </script>